changed according to new model