Improved HitTest