You sure? The old code tried to segment users as early as possible.