Resolving issues after testing

Calculation changes