MENTION SYSTEM - COMMIT #5