add cp, rho and gamma cacluaitons'