Added wave mode