Checkpoint A changes

Checkpoint A changes