diff --git a/oam/install_scripts/columnstore b/oam/install_scripts/columnstore
index 3a7777320..04b83f972 100644
--- a/oam/install_scripts/columnstore
+++ b/oam/install_scripts/columnstore
@@ -91,7 +91,7 @@ start() {
 			exit 1
 		fi
 	fi
-	checkInstallSetup
+	#checkInstallSetup
 
 	CoreFileFlag=`$InstallDir/bin/getConfig -c $InstallDir/etc/Columnstore.xml Installation CoreFileFlag`
 	if [ $CoreFileFlag = "y" ]; then
diff --git a/procmon/main.cpp b/procmon/main.cpp
index 37ae271b0..c13adb819 100644
--- a/procmon/main.cpp
+++ b/procmon/main.cpp
@@ -130,53 +130,6 @@ int main(int argc, char **argv)
 
     	setlocale(LC_ALL, systemLang.c_str());
 
-	// if amazon cloud, check and update Instance IP Addresses and volumes
-	try {
-		oam.getSystemConfig( "Cloud", cloud);
-	}
-	catch(...) {}
-
-	if ( cloud == "amazon-ec2" ) {
-		if(!aMonitor.amazonIPCheck()) {
-			log.writeLog(__LINE__, "ERROR: amazonIPCheck failed, exiting", LOG_TYPE_CRITICAL);
-			sleep(2);
-			string cmd = startup::StartUp::installDir() + "/bin/columnstore stop > /dev/null 2>&1";
-			system(cmd.c_str());
-			exit(1);
-		}
-	}
-
-	//get gluster config
-	try {
-		oam.getSystemConfig( "GlusterConfig", GlusterConfig);
-	}
-	catch(...)
-	{
-		GlusterConfig = "n";
-	}
-
-	if ( GlusterConfig == "y" ) {
-		system("mount -a > /dev/null 2>&1");
-	}
-
-	//hdfs / hadoop config 
-	string DBRootStorageType;
-	try {
-		oam.getSystemConfig( "DBRootStorageType", DBRootStorageType);
-	}
-	catch(...) {}
-
-	if ( DBRootStorageType == "hdfs" )
-		HDFS = true;
-
-	//PMwithUM config 
-	try {
-		oam.getSystemConfig( "PMwithUM", PMwithUM);
-	}
-	catch(...) {
-		PMwithUM = "n";
-	}
-
 	//define entry if missing
 	Config* sysConfig = Config::makeConfig();
 	if ( gOAMParentModuleFlag )
@@ -216,7 +169,13 @@ int main(int argc, char **argv)
 	int moduleStatus = oam::ACTIVE;
 
 	//check if currently configured as Parent OAM Module on startup
+	string DBRootStorageType;
 	if ( gOAMParentModuleFlag ) {
+		try {
+			oam.getSystemConfig( "DBRootStorageType", DBRootStorageType);
+		}
+		catch(...) {}
+
 		if ( ( config.OAMStandbyName() != oam::UnassignedName ) &&
 			DBRootStorageType != "internal" ) {
 			//try for 20 minutes checking if the standby node is up
@@ -331,9 +290,16 @@ int main(int argc, char **argv)
 	}
 	else
 	{
+		bool fresh = false;
+
 		// not active Parent, get updated Columnstore.xml, retry in case ProcMgr isn't up yet
 		if (!HDFS)
 		{
+			//check if this is a fresh install, meaning the Columnstore.xml file is not setup
+			string procmgrIpadd = sysConfig->getConfig("ProcMgr", "IPAddr");
+			if ( procmgrIpadd == "0.0.0.0" )
+			    fresh = true;
+			
 			int count = 0;
 			while(true)
 			{
@@ -360,6 +326,26 @@ int main(int argc, char **argv)
 			MonitorConfig config;
 		}
 
+		//get Distributed Install
+		string DistributedInstall = "y";
+
+		try
+		{
+			oam.getSystemConfig("DistributedInstall", DistributedInstall);
+		}
+		catch (...) 
+		{
+			log.writeLog(__LINE__, "addModule - ERROR: get DistributedInstall", LOG_TYPE_ERROR);
+		}
+
+		//check for a fresh install on a non-distrubuted install setup
+		if ( DistributedInstall == "n" && fresh )
+		{
+		    //run the module install script
+		    string cmd = startup::StartUp::installDir() + "/bin/module_installer.sh " + " --installdir=" + startup::StartUp::installDir() + " --module=" + config.moduleType() + " > /dev/null 2>&1";
+		    system(cmd.c_str());
+		}
+
 		// not OAM parent module, delay starting until a successful get status is performed
 		// makes sure the Parent OAM ProcMon is fully ready
 		while(true)
@@ -389,6 +375,52 @@ int main(int argc, char **argv)
 		exit (1);
 	}
 
+	// if amazon cloud, check and update Instance IP Addresses and volumes
+	try {
+		oam.getSystemConfig( "Cloud", cloud);
+	}
+	catch(...) {}
+
+	if ( cloud == "amazon-ec2" ) {
+		if(!aMonitor.amazonIPCheck()) {
+			log.writeLog(__LINE__, "ERROR: amazonIPCheck failed, exiting", LOG_TYPE_CRITICAL);
+			sleep(2);
+			string cmd = startup::StartUp::installDir() + "/bin/columnstore stop > /dev/null 2>&1";
+			system(cmd.c_str());
+			exit(1);
+		}
+	}
+
+	//get gluster config
+	try {
+		oam.getSystemConfig( "GlusterConfig", GlusterConfig);
+	}
+	catch(...)
+	{
+		GlusterConfig = "n";
+	}
+
+	if ( GlusterConfig == "y" ) {
+		system("mount -a > /dev/null 2>&1");
+	}
+
+	//hdfs / hadoop config 
+	try {
+		oam.getSystemConfig( "DBRootStorageType", DBRootStorageType);
+	}
+	catch(...) {}
+
+	if ( DBRootStorageType == "hdfs" )
+		HDFS = true;
+
+	//PMwithUM config 
+	try {
+		oam.getSystemConfig( "PMwithUM", PMwithUM);
+	}
+	catch(...) {
+		PMwithUM = "n";
+	}
+
 	//check if module is in a DISABLED state
 	bool DISABLED = false;
 	if ( moduleStatus == oam::MAN_DISABLED ||