Added different wave shapes