Adjusted for recent SBo updates