Change var to val in Checkpoints