Updated local variables to be environment variables