Pull in Jon's changes for Checkpoint 2