Updates to model based chapter