Closure added. Improved checkpoints