Improved yat2m.