Tidying and checkpoint
Patches checkpoint