Changed wave queue to wave list