Updated code SB 2.0