More waves implemented.