fix funnel to be simpler