slightly improved messaging