MENTION SYSTEM - COMMIT #8