slight changes to model