fully switched over to new wave generators, plus some optimization