Added more calc functions