bsig refactored + env added