wip
wip
Fix waterfall bugs