checkpoint, some adjustments