Refactor waterfall.