Added CalculateMethods