Checkpoint, seems to be working almost OK now