Final changes to model