Redid polyglot setup