Some re-arrangement to test recovery modes
Logic order changes to aid recovery of RMS after a crash (perhaps)