4 Hours Ago
Some cleanup and support for recalculating after load