removed use waterfall flag