lots of model changes