Updated for the upcoming funnel update