Changing renamed function + restoring end_button setting.