improved messaging