Rewrite of funnel, again