MENTION SYSTEM - COMMIT #6