modify makeMessage