Fixed up model some more