added working wave2 stuff