updated the model class
Basement functions were fixed.