Changes to fit new model
Changes to fit new model