Update Maths
Move Maths in Function to MathFunctions