wave 1->7, to be continued :D
modified for test