Adding some other changes and the beginning of the checkpoint