Some adjustments to the message