Improved the message to the end user