Updating message to make it more uniform