MENTION SYSTEM - COMMIT #10