Major update for over

some equations are different from HCM