reactivated NONBE modifications to see pipeline effects