Added more functions to Calculate