minor changes to the new model