fixed according to new model