updated waterfall