Re-do changes to fix model.