HitTest improved