Added three new waves and changed the other waves a bit