completed major model changes