(regesm) More modifications for ATM-WAV coupling