Committing prior to restructuring display for display_state renaming