Just changed some lines to retain order ingy had in original- will make diff reading a bit easier.
Merge branch 'ReorganizeForEasierIngyDiffReading' into dev