Waterfall redesign