refactored ssub