improve messaging system