Updated model based on Jean Duteau and Chad Armstrong comments