Added most calculations