Id/wave changes