Added back messages removed in past commit and also improved its text