added eric's changes to the models