simpler waterfall transitions

Signed-off-by: Aaron Rosenzweig <aaron@chatnbike.com>
simpler transitions

Signed-off-by: Aaron Rosenzweig <aaron@chatnbike.com>