Added wave class,