Updated for funnel