bsig refactored