MENTION SYSTEM - COMMIT #4