Added update_waterfall switch