Ported updated physics model from 'water' branch