added more filtering for distance from
Merge branch 'KyleR'