Checkpoint - work on annotation