MENTION SYSTEM - COMMIT #7