Working branch

This is a very ugly fix for the LB checkpointing.