updated due to model class changes