Tidy up of development code
Switched order of history