Changed makeMessage method