Tagged waterfall-optimization