A bit of a rebuild in KBs shed
