Fix issue 1065 -- more SB multi-tier updates
Fix issue 1065 -- more SB multi-tier updates