MENTION SYSTEM - COMMIT #12