Fixing High-school maths, and optimising redraw