Updated to new calculation