added genwave and other..