\cc @mishanga could you check bh-part?