Decoupled redraw from nextGeneration