MENTION SYSTEM - COMMIT #2