MENTION SYSTEM - COMMIT #9