changed to include the model