* Tweak the way sbd is stored in state and output