Woah, major bug in recalculation..