everything in line with new model changes