Moved CMS reg saving to end_state on_enter