Changed wave/intermission architecture