Logical tweaks for TPAIntersect - speed boost!