Push forced
Initial load Calculator
Commit small modifications