Working version with waves.