modified the way of returning the message.