Latest changes (checkpoint after long disuse)