Full funnel updates based on code review feedback