Changed opening structure

Problem with single shot mode, unsure why