Added Calculations and Variables