I can agree on first wave then remap