Revised messages
Merge branch 'revise-messages' into develop