SB tidied up