An Improved Funnel Trap for Drift-Fence Surveys