Final Model Changes.

Emma, DO NOT TOUCH.