@@ -21,6 +21,17 @@ def PythonHomeScriptsPath():
 	home = PythonHomePath()
 	return home + "/Scripts"
 
+def PythonPluginScriptPath():
+	tempPath = "not found"
+
+	for path in sys.path:
+		if ('UnrealEnginePython' in path and
+			path.endswith('Content/Scripts')):
+			tempPath = path
+			break
+
+	return tempPath
+
 _PythonHomePath = PythonHomePath()
 
 def FolderCommand(folder):
@@ -42,6 +53,13 @@ def run(process, path=_PythonHomePath, verbose=True):
 		ue.log(stdoutdata[1])
 	return stdoutdata[1] #return the data for dependent functions
 
+#convenience override
+def runLogOutput(process, path=_PythonHomePath):
+	fullcommand = FolderCommand(path) + process
+	stdoutdata = subprocess.getstatusoutput(fullcommand)
+	ue.log(stdoutdata[1])
+	return stdoutdata[1]
+
 #convenience wrappers
 def dir(path=_PythonHomePath):
 	run('dir', path)
 
@@ -11,36 +11,60 @@ def checkPipDirectory():
 	configPath = cmd.PythonPluginScriptPath() + '/upyconfig.json'
 	correctPipPath = cmd.PythonHomeScriptsPath()
 
-	#let's test our pip directory path
+	#compare our current pip directory with the installed one, if they differ reinstall pip
 	try:
-		with open(configPath) as data_file:
-			configs = json.load(data_file)
+		with open(configPath, "r+") as configFile:
+			configs = json.load(configFile)
 
 			#grab currently stored path
 			storedPipPath = configs['pipDirectoryPath']
 
-			print(storedPipPath)
-			print(tempPath)
+			print('upystartup::Checking pip location on startup')
+			print('upystartup::stored loc: ' + storedPipPath)
+			print('upystartup::correct loc: ' + correctPipPath)
 
 			#compare paths
 			if (storedPipPath != correctPipPath):
 				#if they don't match, remove the pip module and reinstall pip for this module
-				
+				print('upystartup::Pip installation directory is stale, re-installing.')
+
 				libPath = cmd.PythonHomePath() + '/Lib/site-packages'
 				dirs = listdir(libPath)
-				print(libPath)
-				print(dirs)
 
 				tempPath = None
+				#find the directory that contains pip and ends with .dist-info
 				for directory in dirs:
-					if ('pip' in directory and
+					#print(directory)
+					if (directory.startswith('pip') and
 						directory.endswith('.dist-info')):
-						tempPath = libPath + directory
+						tempPath = libPath + "/" + directory
+						break
+
+				if(tempPath != None):
+					#remove the old directory
+					print('removing old: ' + tempPath)
+					cmd.run('rmdir /S /Q "' + tempPath + '"')
+				
+				#install pip
+				print(cmd.PythonHomePath() + '/get-pip.py')
+
+				print('Installing pip...')
+				cmd.runLogOutput('InstallPip.bat')
+
+				#update our stored location
+				configs['pipDirectoryPath'] = correctPipPath
+				configFile.seek(0)
+				configFile.write(json.dumps(configs))
+				configFile.truncate()
+
+				#done
+				print('upystartup::updated pip.exe location in <' + configPath + '>')
+
+			else:
+				print('upystartup::pip location is up to date.')
 
-				print(tempPath)
-				#rmdir Li
 	except:
-		e = sys.exc_info()[0]
+		e = sys.exc_info()
 		ue.log('upyconfig.json error: ' + str(e))
 
 #add any startup action you wish to perform in python