Adding more waves for testing