First commit
Fixed checkpoints