Changed a bit in Funnel