Replace old with-tox to with-pan