Added extra waterfall options