Improved the messages