Improve recalc

yep copying from Sam