change to 9x9 and add WaveControl