improve messaging