Added all the maths, looks great