re-org for polyglot