checkpoint
extra tweaks