Save the Waves for S8+