Further work for JWP6 update for audio.