Got waterfall working again