got rid of cruft
added recalc