Checkpoint: about to simplify code a bit