wip enviroments fix