model changes

more model changes