WAVES UPDATED