Updated calculations and added js file calculation.js