Calculation Working now