Checkpoint before some big changes