Changed environment variables to the right way