Added Additional Calculations