Fixes/changes checkpoint