Updated to new version of model