Added more wave code