hack in tighter uop integration