Restore the connection between the first reserve phase and the final regular phase. Fix a logic hole in the initial conditions setting for controls in the energy method. - #1287