Reorder the BP loop to make manager persistence more reliable