Continue refactoring, tweak sban