adding remaining basic checkpoints