Enhanced Version of BComp, still in progress