Convert for new environment