Moved message sending out of the grammar