[BS] Refactored some SS Stuff
[BS] More SS