Checkpoint, two separate widgets!

Checkpoint, two separate widgets!