Changes to fit new model