better improvement for nm-classic message?