extracted model changes and changes that should be elsewhere