Checkpoint, still ugly