Calculation updates

Added better calculations