Improved the message