Improved recalc and more