updated to have a unique_message field