Our Waterfall is now fixed and working