edit to include the message as requested