Latest updates to accommodate the change to the new model.