Checkpoint
Redesign
Misc changes