Improved waterfall demo