Updated, now with better waves