Checkpoint before switching back