Added maths functions and choices