Changed environment variable
Made the method simpler