Patches - better solution with object to handle checkpoints