diff --git a/CG_Files/Employee_A/dmca.nm b/CG_Files/Employee_A/dmca.nm
index a1a13db..38172ed 100644
--- a/CG_Files/Employee_A/dmca.nm
+++ b/CG_Files/Employee_A/dmca.nm
@@ -1,16 +1,16 @@
 network model =
-	assets:
+	assets:		
 		torrent_prog_A;
 		illicit_sw_A_1;
 		illicit_sw_A_2;
-		illicit_sw_A_3;
-		
-	facts:
-		quality:torrent_prog_A,is_installed=true;
-	
-		quality:illicit_sw_A_1,is_installed=true;
-		quality:illicit_sw_A_2,is_installed=true;
-		quality:illicit_sw_A_3,is_installed=true;
+		illicit_sw_A_3;	
 
-		topology:illicit_sw_A_1->illicit_sw_A_2,org;
+	facts:
+		quality:torrent_prog_A,prog_A_is_installed=true;
+
+		quality:illicit_sw_A_1,sw_A_1_is_installed=true;
+		quality:illicit_sw_A_2,sw_A_2_is_installed=true;
+		quality:illicit_sw_A_3,sw_A_3_is_installed=true;
+
+		topology:illicit_sw_A_2->illicit_sw_A_3,org;
 .
diff --git a/CG_Files/Employee_A/dmca.xp b/CG_Files/Employee_A/dmca.xp
index adb1576..069c1ee 100644
--- a/CG_Files/Employee_A/dmca.xp
+++ b/CG_Files/Employee_A/dmca.xp
@@ -1,27 +1,27 @@
 exploit remove_torrent_prog_A(torrent_prog_A)=
 	preconditions:
-		quality:torrent_prog_A,is_installed=true;
+		quality:torrent_prog_A,prog_A_is_installed=true;
 	postconditions:
-		update quality:torrent_prog_A,is_installed=false;
+		update quality:torrent_prog_A,prog_A_is_installed=false;
 .
 
 exploit remove_illicit_sw_A_1(illicit_sw_A_1)=
 	preconditions:
-		quality:illicit_sw_A_1,is_installed=true;
+		quality:illicit_sw_A_1,sw_A_1_is_installed=true;
 	postconditions:
-		update quality:illicit_sw_A_1,is_installed=false;
+		update quality:illicit_sw_A_1,sw_A_1_is_installed=false;
 .
 
 exploit remove_illicit_sw_A_2(illicit_sw_A_2)=
 	preconditions:
-		quality:illicit_sw_A_2,is_installed=true;
+		quality:illicit_sw_A_2,sw_A_2_is_installed=true;
 	postconditions:
-		update quality:illicit_sw_A_2,is_installed=false;
+		update quality:illicit_sw_A_2,sw_A_2_is_installed=false;
 .
 
 exploit remove_illicit_sw_A_3(illicit_sw_A_3)=
 	preconditions:
-		quality:illicit_sw_A_3,is_installed=true;
+		quality:illicit_sw_A_3,sw_A_3_is_installed=true;
 	postconditions:
-		update quality:illicit_sw_A_3,is_installed=false;
+		update quality:illicit_sw_A_3,sw_A_3_is_installed=false;
 .
diff --git a/CG_Files/Employee_A/sync_dmca.xp b/CG_Files/Employee_A/sync_dmca.xp
index 885a56c..e758861 100644
--- a/CG_Files/Employee_A/sync_dmca.xp
+++ b/CG_Files/Employee_A/sync_dmca.xp
@@ -1,12 +1,12 @@
 uninstall group exploit remove_all_A(torrent_prog_A,illicit_sw_A_1,illicit_sw_A_2,illicit_sw_A_3)=
 	preconditions:
-		quality:torrent_prog_A,is_installed=true;
-		quality:illicit_sw_A_1,is_installed=true;
-		quality:illicit_sw_A_2,is_installed=true;
-		quality:illicit_sw_A_3,is_installed=true;
+		quality:torrent_prog_A,prog_A_is_installed=true;
+		quality:illicit_sw_A_1,sw_A_1_is_installed=true;
+		quality:illicit_sw_A_2,sw_A_2_is_installed=true;
+		quality:illicit_sw_A_3,sw_A_3_is_installed=true;
 	postconditions:
-		update quality:torrent_prog_A,is_installed=false;
-		update quality:illicit_sw_A_1,is_installed=false;
-		update quality:illicit_sw_A_2,is_installed=false;
-		update quality:illicit_sw_A_3,is_installed=false;
+		quality:torrent_prog_A,prog_A_is_installed=false;
+		quality:illicit_sw_A_1,sw_A_1_is_installed=false;
+		quality:illicit_sw_A_2,sw_A_2_is_installed=false;
+		quality:illicit_sw_A_3,sw_A_3_is_installed=false;
 .
diff --git a/CG_Files/Employee_AB/dmca.nm b/CG_Files/Employee_AB/dmca.nm
index 8680980..1ac123d 100644
--- a/CG_Files/Employee_AB/dmca.nm
+++ b/CG_Files/Employee_AB/dmca.nm
@@ -1,28 +1,29 @@
 network model =
-	assets:
-		torrent_prog_A;
-		illicit_sw_A_1;
-		illicit_sw_A_2;
-		illicit_sw_A_3;
-		
+	assets:		
 		torrent_prog_B;
 		illicit_sw_B_1;
 		illicit_sw_B_2;
 		illicit_sw_B_3;	
-		illicit_sw_B_4;		
+		illicit_sw_B_4;	
+		
+		torrent_prog_A;
+		illicit_sw_A_1;
+		illicit_sw_A_2;
+		illicit_sw_A_3;	
 
 	facts:
-		quality:torrent_prog_A,is_installed=true;
-		quality:torrent_prog_B,is_installed=true;
-	
-		quality:illicit_sw_A_1,is_installed=true;
-		quality:illicit_sw_A_2,is_installed=true;
-		quality:illicit_sw_A_3,is_installed=true;
+		quality:torrent_prog_B,prog_B_is_installed=true;
 
-		quality:illicit_sw_B_1,is_installed=true;
-		quality:illicit_sw_B_2,is_installed=true;
-		quality:illicit_sw_B_3,is_installed=true;
-		quality:illicit_sw_B_4,is_installed=true;
+		quality:illicit_sw_B_1,sw_B_1_is_installed=true;
+		quality:illicit_sw_B_2,sw_B_2_is_installed=true;
+		quality:illicit_sw_B_3,sw_B_3_is_installed=true;
+		quality:illicit_sw_B_4,sw_B_4_is_installed=true;
+		
+		quality:torrent_prog_A,prog_A_is_installed=true;
 
-		topology:illicit_sw_B_2->illicit_sw_B_3,org;
+		quality:illicit_sw_A_1,sw_A_1_is_installed=true;
+		quality:illicit_sw_A_2,sw_A_2_is_installed=true;
+		quality:illicit_sw_A_3,sw_A_3_is_installed=true;
+
+		topology:illicit_sw_B_3->illicit_sw_B_4,org;
 .
diff --git a/CG_Files/Employee_AB/dmca.xp b/CG_Files/Employee_AB/dmca.xp
index 12779fa..64085f2 100644
--- a/CG_Files/Employee_AB/dmca.xp
+++ b/CG_Files/Employee_AB/dmca.xp
@@ -1,62 +1,64 @@
-exploit remove_torrent_prog_A(torrent_prog_A)=
-	preconditions:
-		quality:torrent_prog_A,is_installed=true;
-	postconditions:
-		update quality:torrent_prog_A,is_installed=false;
-.
-
 exploit remove_torrent_prog_B(torrent_prog_B)=
 	preconditions:
-		quality:torrent_prog_B,is_installed=true;
+		quality:torrent_prog_B,prog_B_is_installed=true;
 	postconditions:
-		update quality:torrent_prog_B,is_installed=false;
-.
-
-exploit remove_illicit_sw_A_1(illicit_sw_A_1)=
-	preconditions:
-		quality:illicit_sw_A_1,is_installed=true;
-	postconditions:
-		update quality:illicit_sw_A_1,is_installed=false;
-.
-
-exploit remove_illicit_sw_A_2(illicit_sw_A_2)=
-	preconditions:
-		quality:illicit_sw_A_2,is_installed=true;
-	postconditions:
-		update quality:illicit_sw_A_2,is_installed=false;
-.
-
-exploit remove_illicit_sw_A_3(illicit_sw_A_3)=
-	preconditions:
-		quality:illicit_sw_A_3,is_installed=true;
-	postconditions:
-		update quality:illicit_sw_A_3,is_installed=false;
+		update quality:torrent_prog_B,prog_B_is_installed=false;
 .
 
 exploit remove_illicit_sw_B_1(illicit_sw_B_1)=
 	preconditions:
-		quality:illicit_sw_B_1,is_installed=true;
+		quality:illicit_sw_B_1,sw_B_1_is_installed=true;
 	postconditions:
-		update quality:illicit_sw_B_1,is_installed=false;
+		update quality:illicit_sw_B_1,sw_B_1_is_installed=false;
 .
 
 exploit remove_illicit_sw_B_2(illicit_sw_B_2)=
 	preconditions:
-		quality:illicit_sw_B_2,is_installed=true;
+		quality:illicit_sw_B_2,sw_B_2_is_installed=true;
 	postconditions:
-		update quality:illicit_sw_B_2,is_installed=false;
+		update quality:illicit_sw_B_2,sw_B_2_is_installed=false;
 .
 
 exploit remove_illicit_sw_B_3(illicit_sw_B_3)=
 	preconditions:
-		quality:illicit_sw_B_3,is_installed=true;
+		quality:illicit_sw_B_3,sw_B_3_is_installed=true;
 	postconditions:
-		update quality:illicit_sw_B_3,is_installed=false;
+		update quality:illicit_sw_B_3,sw_B_3_is_installed=false;
 .
 
 exploit remove_illicit_sw_B_4(illicit_sw_B_4)=
 	preconditions:
-		quality:illicit_sw_B_4,is_installed=true;
+		quality:illicit_sw_B_4,sw_B_4_is_installed=true;
 	postconditions:
-		update quality:illicit_sw_B_4,is_installed=false;
+		update quality:illicit_sw_B_4,sw_B_4_is_installed=false;
 .
+
+exploit remove_torrent_prog_A(torrent_prog_A)=
+	preconditions:
+		quality:torrent_prog_A,prog_A_is_installed=true;
+	postconditions:
+		update quality:torrent_prog_A,prog_A_is_installed=false;
+.
+
+exploit remove_illicit_sw_A_1(illicit_sw_A_1)=
+	preconditions:
+		quality:illicit_sw_A_1,sw_A_1_is_installed=true;
+	postconditions:
+		update quality:illicit_sw_A_1,sw_A_1_is_installed=false;
+.
+
+exploit remove_illicit_sw_A_2(illicit_sw_A_2)=
+	preconditions:
+		quality:illicit_sw_A_2,sw_A_2_is_installed=true;
+	postconditions:
+		update quality:illicit_sw_A_2,sw_A_2_is_installed=false;
+.
+
+exploit remove_illicit_sw_A_3(illicit_sw_A_3)=
+	preconditions:
+		quality:illicit_sw_A_3,sw_A_3_is_installed=true;
+	postconditions:
+		update quality:illicit_sw_A_3,sw_A_3_is_installed=false;
+.
+
+
diff --git a/CG_Files/Employee_AB/sync_dmca.xp b/CG_Files/Employee_AB/sync_dmca.xp
index 5c6cb0b..42c74dc 100644
--- a/CG_Files/Employee_AB/sync_dmca.xp
+++ b/CG_Files/Employee_AB/sync_dmca.xp
@@ -1,27 +1,28 @@
-uninstall group exploit remove_all_A(torrent_prog_A,illicit_sw_A_1,illicit_sw_A_2,illicit_sw_A_3)=
-	preconditions:
-		quality:torrent_prog_A,is_installed=true;
-		quality:illicit_sw_A_1,is_installed=true;
-		quality:illicit_sw_A_2,is_installed=true;
-		quality:illicit_sw_A_3,is_installed=true;
-	postconditions:
-		update quality:torrent_prog_A,is_installed=false;
-		update quality:illicit_sw_A_1,is_installed=false;
-		update quality:illicit_sw_A_2,is_installed=false;
-		update quality:illicit_sw_A_3,is_installed=false;
-.
-
 uninstall group exploit remove_all_B(torrent_prog_B,illicit_sw_B_1,illicit_sw_B_2,illicit_sw_B_3,illicit_sw_B_4)=
 	preconditions:
-		quality:torrent_prog_B,is_installed=true;
-		quality:illicit_sw_B_1,is_installed=true;
-		quality:illicit_sw_B_2,is_installed=true;
-		quality:illicit_sw_B_3,is_installed=true;
-		quality:illicit_sw_B_4,is_installed=true;
+		quality:torrent_prog_B,prog_B_is_installed=true;
+		quality:illicit_sw_B_1,sw_B_1_is_installed=true;
+		quality:illicit_sw_B_2,sw_B_2_is_installed=true;
+		quality:illicit_sw_B_3,sw_B_3_is_installed=true;
+		quality:illicit_sw_B_4,sw_B_4_is_installed=true;
 	postconditions:
-		update quality:torrent_prog_B,is_installed=false;
-		update quality:illicit_sw_B_1,is_installed=false;
-		update quality:illicit_sw_B_2,is_installed=false;
-		update quality:illicit_sw_B_3,is_installed=false;
-		update quality:illicit_sw_B_4,is_installed=false;
+		quality:torrent_prog_B,prog_B_is_installed=false;
+		quality:illicit_sw_B_1,sw_B_1_is_installed=false;
+		quality:illicit_sw_B_2,sw_B_2_is_installed=false;
+		quality:illicit_sw_B_3,sw_B_3_is_installed=false;
+		quality:illicit_sw_B_4,sw_B_4_is_installed=false;
 .
+
+uninstall group exploit remove_all_A(torrent_prog_A,illicit_sw_A_1,illicit_sw_A_2,illicit_sw_A_3)=
+	preconditions:
+		quality:torrent_prog_A,prog_A_is_installed=true;
+		quality:illicit_sw_A_1,sw_A_1_is_installed=true;
+		quality:illicit_sw_A_2,sw_A_2_is_installed=true;
+		quality:illicit_sw_A_3,sw_A_3_is_installed=true;
+	postconditions:
+		quality:torrent_prog_A,prog_A_is_installed=false;
+		quality:illicit_sw_A_1,sw_A_1_is_installed=false;
+		quality:illicit_sw_A_2,sw_A_2_is_installed=false;
+		quality:illicit_sw_A_3,sw_A_3_is_installed=false;
+.
+
diff --git a/CG_Files/Employee_ABC/dmca.nm b/CG_Files/Employee_ABC/dmca.nm
index d7a4f39..821d2ea 100644
--- a/CG_Files/Employee_ABC/dmca.nm
+++ b/CG_Files/Employee_ABC/dmca.nm
@@ -1,15 +1,15 @@
 network model =
-	assets:
-		torrent_prog_A;
-		illicit_sw_A_1;
-		illicit_sw_A_2;
-		illicit_sw_A_3;
-		
+	assets:		
 		torrent_prog_B;
 		illicit_sw_B_1;
 		illicit_sw_B_2;
 		illicit_sw_B_3;	
-		illicit_sw_B_4;		
+		illicit_sw_B_4;	
+		
+		torrent_prog_A;
+		illicit_sw_A_1;
+		illicit_sw_A_2;
+		illicit_sw_A_3;	
 		
 		torrent_prog_C;
 		illicit_sw_C_1;
@@ -21,26 +21,28 @@ network model =
 		illicit_sw_C_7;	
 
 	facts:
-		quality:torrent_prog_A,is_installed=true;
-		quality:torrent_prog_B,is_installed=true;
-		quality:torrent_prog_C,is_installed=true;
-	
-		quality:illicit_sw_A_1,is_installed=true;
-		quality:illicit_sw_A_2,is_installed=true;
-		quality:illicit_sw_A_3,is_installed=true;
+		quality:torrent_prog_B,prog_B_is_installed=true;
 
-		quality:illicit_sw_B_1,is_installed=true;
-		quality:illicit_sw_B_2,is_installed=true;
-		quality:illicit_sw_B_3,is_installed=true;
-		quality:illicit_sw_B_4,is_installed=true;
+		quality:illicit_sw_B_1,sw_B_1_is_installed=true;
+		quality:illicit_sw_B_2,sw_B_2_is_installed=true;
+		quality:illicit_sw_B_3,sw_B_3_is_installed=true;
+		quality:illicit_sw_B_4,sw_B_4_is_installed=true;
+		
+		quality:torrent_prog_A,prog_A_is_installed=true;
 
-		quality:illicit_sw_C_1,is_installed=true;
-		quality:illicit_sw_C_2,is_installed=true;
-		quality:illicit_sw_C_3,is_installed=true;
-		quality:illicit_sw_C_4,is_installed=true;
-		quality:illicit_sw_C_5,is_installed=true;
-		quality:illicit_sw_C_6,is_installed=true;
-		quality:illicit_sw_C_7,is_installed=true;
+		quality:illicit_sw_A_1,sw_A_1_is_installed=true;
+		quality:illicit_sw_A_2,sw_A_2_is_installed=true;
+		quality:illicit_sw_A_3,sw_A_3_is_installed=true;
+		
+		quality:torrent_prog_C,prog_C_is_installed=true;
 
-		topology:illicit_sw_C_6->illicit_sw_C_7,org;
+		quality:illicit_sw_C_1,sw_C_1_is_installed=true;
+		quality:illicit_sw_C_2,sw_C_2_is_installed=true;
+		quality:illicit_sw_C_3,sw_C_3_is_installed=true;
+		quality:illicit_sw_C_4,sw_C_4_is_installed=true;
+		quality:illicit_sw_C_5,sw_C_5_is_installed=true;
+		quality:illicit_sw_C_6,sw_C_6_is_installed=true;
+		quality:illicit_sw_C_7,sw_C_7_is_installed=true;
+
+		topology:illicit_sw_B_3->illicit_sw_B_4,org;
 .
diff --git a/CG_Files/Employee_ABC/dmca.xp b/CG_Files/Employee_ABC/dmca.xp
index a3d0957..7fb7139 100644
--- a/CG_Files/Employee_ABC/dmca.xp
+++ b/CG_Files/Employee_ABC/dmca.xp
@@ -1,118 +1,118 @@
-exploit remove_torrent_prog_A(torrent_prog_A)=
-	preconditions:
-		quality:torrent_prog_A,is_installed=true;
-	postconditions:
-		update quality:torrent_prog_A,is_installed=false;
-.
-
 exploit remove_torrent_prog_B(torrent_prog_B)=
 	preconditions:
-		quality:torrent_prog_B,is_installed=true;
+		quality:torrent_prog_B,prog_B_is_installed=true;
 	postconditions:
-		update quality:torrent_prog_B,is_installed=false;
-.
-
-exploit remove_torrent_prog_C(torrent_prog_C)=
-	preconditions:
-		quality:torrent_prog_C,is_installed=true;
-	postconditions:
-		update quality:torrent_prog_C,is_installed=false;
-.
-
-exploit remove_illicit_sw_A_1(illicit_sw_A_1)=
-	preconditions:
-		quality:illicit_sw_A_1,is_installed=true;
-	postconditions:
-		update quality:illicit_sw_A_1,is_installed=false;
-.
-
-exploit remove_illicit_sw_A_2(illicit_sw_A_2)=
-	preconditions:
-		quality:illicit_sw_A_2,is_installed=true;
-	postconditions:
-		update quality:illicit_sw_A_2,is_installed=false;
-.
-
-exploit remove_illicit_sw_A_3(illicit_sw_A_3)=
-	preconditions:
-		quality:illicit_sw_A_3,is_installed=true;
-	postconditions:
-		update quality:illicit_sw_A_3,is_installed=false;
+		update quality:torrent_prog_B,prog_B_is_installed=false;
 .
 
 exploit remove_illicit_sw_B_1(illicit_sw_B_1)=
 	preconditions:
-		quality:illicit_sw_B_1,is_installed=true;
+		quality:illicit_sw_B_1,sw_B_1_is_installed=true;
 	postconditions:
-		update quality:illicit_sw_B_1,is_installed=false;
+		update quality:illicit_sw_B_1,sw_B_1_is_installed=false;
 .
 
 exploit remove_illicit_sw_B_2(illicit_sw_B_2)=
 	preconditions:
-		quality:illicit_sw_B_2,is_installed=true;
+		quality:illicit_sw_B_2,sw_B_2_is_installed=true;
 	postconditions:
-		update quality:illicit_sw_B_2,is_installed=false;
+		update quality:illicit_sw_B_2,sw_B_2_is_installed=false;
 .
 
 exploit remove_illicit_sw_B_3(illicit_sw_B_3)=
 	preconditions:
-		quality:illicit_sw_B_3,is_installed=true;
+		quality:illicit_sw_B_3,sw_B_3_is_installed=true;
 	postconditions:
-		update quality:illicit_sw_B_3,is_installed=false;
+		update quality:illicit_sw_B_3,sw_B_3_is_installed=false;
 .
 
 exploit remove_illicit_sw_B_4(illicit_sw_B_4)=
 	preconditions:
-		quality:illicit_sw_B_4,is_installed=true;
+		quality:illicit_sw_B_4,sw_B_4_is_installed=true;
 	postconditions:
-		update quality:illicit_sw_B_4,is_installed=false;
+		update quality:illicit_sw_B_4,sw_B_4_is_installed=false;
+.
+
+exploit remove_torrent_prog_A(torrent_prog_A)=
+	preconditions:
+		quality:torrent_prog_A,prog_A_is_installed=true;
+	postconditions:
+		update quality:torrent_prog_A,prog_A_is_installed=false;
+.
+
+exploit remove_illicit_sw_A_1(illicit_sw_A_1)=
+	preconditions:
+		quality:illicit_sw_A_1,sw_A_1_is_installed=true;
+	postconditions:
+		update quality:illicit_sw_A_1,sw_A_1_is_installed=false;
+.
+
+exploit remove_illicit_sw_A_2(illicit_sw_A_2)=
+	preconditions:
+		quality:illicit_sw_A_2,sw_A_2_is_installed=true;
+	postconditions:
+		update quality:illicit_sw_A_2,sw_A_2_is_installed=false;
+.
+
+exploit remove_illicit_sw_A_3(illicit_sw_A_3)=
+	preconditions:
+		quality:illicit_sw_A_3,sw_A_3_is_installed=true;
+	postconditions:
+		update quality:illicit_sw_A_3,sw_A_3_is_installed=false;
+.
+
+exploit remove_torrent_prog_C(torrent_prog_C)=
+	preconditions:
+		quality:torrent_prog_C,prog_C_is_installed=true;
+	postconditions:
+		update quality:torrent_prog_C,prog_C_is_installed=false;
 .
 
 exploit remove_illicit_sw_C_1(illicit_sw_C_1)=
 	preconditions:
-		quality:illicit_sw_C_1,is_installed=true;
+		quality:illicit_sw_C_1,sw_C_1_is_installed=true;
 	postconditions:
-		update quality:illicit_sw_C_1,is_installed=false;
+		update quality:illicit_sw_C_1,sw_C_1_is_installed=false;
 .
 
 exploit remove_illicit_sw_C_2(illicit_sw_C_2)=
 	preconditions:
-		quality:illicit_sw_C_2,is_installed=true;
+		quality:illicit_sw_C_2,sw_C_2_is_installed=true;
 	postconditions:
-		update quality:illicit_sw_C_2,is_installed=false;
+		update quality:illicit_sw_C_2,sw_C_2_is_installed=false;
 .
 
 exploit remove_illicit_sw_C_3(illicit_sw_C_3)=
 	preconditions:
-		quality:illicit_sw_C_3,is_installed=true;
+		quality:illicit_sw_C_3,sw_C_3_is_installed=true;
 	postconditions:
-		update quality:illicit_sw_C_3,is_installed=false;
+		update quality:illicit_sw_C_3,sw_C_3_is_installed=false;
 .
 
 exploit remove_illicit_sw_C_4(illicit_sw_C_4)=
 	preconditions:
-		quality:illicit_sw_C_4,is_installed=true;
+		quality:illicit_sw_C_4,sw_C_4_is_installed=true;
 	postconditions:
-		update quality:illicit_sw_C_4,is_installed=false;
+		update quality:illicit_sw_C_4,sw_C_4_is_installed=false;
 .
 
 exploit remove_illicit_sw_C_5(illicit_sw_C_5)=
 	preconditions:
-		quality:illicit_sw_C_5,is_installed=true;
+		quality:illicit_sw_C_5,sw_C_5_is_installed=true;
 	postconditions:
-		update quality:illicit_sw_C_5,is_installed=false;
+		update quality:illicit_sw_C_5,sw_C_5_is_installed=false;
 .
 
 exploit remove_illicit_sw_C_6(illicit_sw_C_6)=
 	preconditions:
-		quality:illicit_sw_C_6,is_installed=true;
+		quality:illicit_sw_C_6,sw_C_6_is_installed=true;
 	postconditions:
-		update quality:illicit_sw_C_6,is_installed=false;
+		update quality:illicit_sw_C_6,sw_C_6_is_installed=false;
 .
 
 exploit remove_illicit_sw_C_7(illicit_sw_C_7)=
 	preconditions:
-		quality:illicit_sw_C_7,is_installed=true;
+		quality:illicit_sw_C_7,sw_C_7_is_installed=true;
 	postconditions:
-		update quality:illicit_sw_C_7,is_installed=false;
+		update quality:illicit_sw_C_7,sw_C_7_is_installed=false;
 .
diff --git a/CG_Files/Employee_ABC/sync_dmca.xp b/CG_Files/Employee_ABC/sync_dmca.xp
index f3ebf8f..eef4aa9 100644
--- a/CG_Files/Employee_ABC/sync_dmca.xp
+++ b/CG_Files/Employee_ABC/sync_dmca.xp
@@ -1,48 +1,48 @@
-uninstall group exploit remove_all_A(torrent_prog_A,illicit_sw_A_1,illicit_sw_A_2,illicit_sw_A_3)=
-	preconditions:
-		quality:torrent_prog_A,is_installed=true;
-		quality:illicit_sw_A_1,is_installed=true;
-		quality:illicit_sw_A_2,is_installed=true;
-		quality:illicit_sw_A_3,is_installed=true;
-	postconditions:
-		update quality:torrent_prog_A,is_installed=false;
-		update quality:illicit_sw_A_1,is_installed=false;
-		update quality:illicit_sw_A_2,is_installed=false;
-		update quality:illicit_sw_A_3,is_installed=false;
-.
-
 uninstall group exploit remove_all_B(torrent_prog_B,illicit_sw_B_1,illicit_sw_B_2,illicit_sw_B_3,illicit_sw_B_4)=
 	preconditions:
-		quality:torrent_prog_B,is_installed=true;
-		quality:illicit_sw_B_1,is_installed=true;
-		quality:illicit_sw_B_2,is_installed=true;
-		quality:illicit_sw_B_3,is_installed=true;
-		quality:illicit_sw_B_4,is_installed=true;
+		quality:torrent_prog_B,prog_B_is_installed=true;
+		quality:illicit_sw_B_1,sw_B_1_is_installed=true;
+		quality:illicit_sw_B_2,sw_B_2_is_installed=true;
+		quality:illicit_sw_B_3,sw_B_3_is_installed=true;
+		quality:illicit_sw_B_4,sw_B_4_is_installed=true;
 	postconditions:
-		update quality:torrent_prog_B,is_installed=false;
-		update quality:illicit_sw_B_1,is_installed=false;
-		update quality:illicit_sw_B_2,is_installed=false;
-		update quality:illicit_sw_B_3,is_installed=false;
-		update quality:illicit_sw_B_4,is_installed=false;
+		quality:torrent_prog_B,prog_B_is_installed=false;
+		quality:illicit_sw_B_1,sw_B_1_is_installed=false;
+		quality:illicit_sw_B_2,sw_B_2_is_installed=false;
+		quality:illicit_sw_B_3,sw_B_3_is_installed=false;
+		quality:illicit_sw_B_4,sw_B_4_is_installed=false;
+.
+
+uninstall group exploit remove_all_A(torrent_prog_A,illicit_sw_A_1,illicit_sw_A_2,illicit_sw_A_3)=
+	preconditions:
+		quality:torrent_prog_A,prog_A_is_installed=true;
+		quality:illicit_sw_A_1,sw_A_1_is_installed=true;
+		quality:illicit_sw_A_2,sw_A_2_is_installed=true;
+		quality:illicit_sw_A_3,sw_A_3_is_installed=true;
+	postconditions:
+		quality:torrent_prog_A,prog_A_is_installed=false;
+		quality:illicit_sw_A_1,sw_A_1_is_installed=false;
+		quality:illicit_sw_A_2,sw_A_2_is_installed=false;
+		quality:illicit_sw_A_3,sw_A_3_is_installed=false;
 .
 
 uninstall group exploit remove_all_C(torrent_prog_C,illicit_sw_C_1,illicit_sw_C_2,illicit_sw_C_3,illicit_sw_C_4,illicit_sw_C_5,illicit_sw_C_6,illicit_sw_C_7)=
 	preconditions:
-		quality:torrent_prog_C,is_installed=true;
-		quality:illicit_sw_C_1,is_installed=true;
-		quality:illicit_sw_C_2,is_installed=true;
-		quality:illicit_sw_C_3,is_installed=true;
-		quality:illicit_sw_C_4,is_installed=true;
-		quality:illicit_sw_C_5,is_installed=true;
-		quality:illicit_sw_C_6,is_installed=true;
-		quality:illicit_sw_C_7,is_installed=true;
+		quality:torrent_prog_C,prog_C_is_installed=true;
+		quality:illicit_sw_C_1,sw_C_1_is_installed=true;
+		quality:illicit_sw_C_2,sw_C_2_is_installed=true;
+		quality:illicit_sw_C_3,sw_C_3_is_installed=true;
+		quality:illicit_sw_C_4,sw_C_4_is_installed=true;
+		quality:illicit_sw_C_5,sw_C_5_is_installed=true;
+		quality:illicit_sw_C_6,sw_C_6_is_installed=true;
+		quality:illicit_sw_C_7,sw_C_7_is_installed=true;
 	postconditions:
-		update quality:torrent_prog_C,is_installed=false;
-		update quality:illicit_sw_C_1,is_installed=false;
-		update quality:illicit_sw_C_2,is_installed=false;
-		update quality:illicit_sw_C_3,is_installed=false;
-		update quality:illicit_sw_C_4,is_installed=false;
-		update quality:illicit_sw_C_5,is_installed=false;
-		update quality:illicit_sw_C_6,is_installed=false;
-		update quality:illicit_sw_C_7,is_installed=false;
+		quality:torrent_prog_C,prog_C_is_installed=false;
+		quality:illicit_sw_C_1,sw_C_1_is_installed=false;
+		quality:illicit_sw_C_2,sw_C_2_is_installed=false;
+		quality:illicit_sw_C_3,sw_C_3_is_installed=false;
+		quality:illicit_sw_C_4,sw_C_4_is_installed=false;
+		quality:illicit_sw_C_5,sw_C_5_is_installed=false;
+		quality:illicit_sw_C_6,sw_C_6_is_installed=false;
+		quality:illicit_sw_C_7,sw_C_7_is_installed=false;
 .
diff --git a/CG_Files/Employee_AC/dmca.nm b/CG_Files/Employee_AC/dmca.nm
index 1ac2dff..dd35974 100644
--- a/CG_Files/Employee_AC/dmca.nm
+++ b/CG_Files/Employee_AC/dmca.nm
@@ -1,10 +1,5 @@
 network model =
-	assets:
-		torrent_prog_A;
-		illicit_sw_A_1;
-		illicit_sw_A_2;
-		illicit_sw_A_3;	
-		
+	assets:		
 		torrent_prog_C;
 		illicit_sw_C_1;
 		illicit_sw_C_2;
@@ -13,22 +8,28 @@ network model =
 		illicit_sw_C_5;	
 		illicit_sw_C_6;	
 		illicit_sw_C_7;	
+		
+		torrent_prog_A;
+		illicit_sw_A_1;
+		illicit_sw_A_2;
+		illicit_sw_A_3;	
 
 	facts:
-		quality:torrent_prog_A,is_installed=true;
-		quality:torrent_prog_C,is_installed=true;
-	
-		quality:illicit_sw_A_1,is_installed=true;
-		quality:illicit_sw_A_2,is_installed=true;
-		quality:illicit_sw_A_3,is_installed=true;
+		quality:torrent_prog_C,prog_C_is_installed=true;
 
-		quality:illicit_sw_C_1,is_installed=true;
-		quality:illicit_sw_C_2,is_installed=true;
-		quality:illicit_sw_C_3,is_installed=true;
-		quality:illicit_sw_C_4,is_installed=true;
-		quality:illicit_sw_C_5,is_installed=true;
-		quality:illicit_sw_C_6,is_installed=true;
-		quality:illicit_sw_C_7,is_installed=true;
+		quality:illicit_sw_C_1,sw_C_1_is_installed=true;
+		quality:illicit_sw_C_2,sw_C_2_is_installed=true;
+		quality:illicit_sw_C_3,sw_C_3_is_installed=true;
+		quality:illicit_sw_C_4,sw_C_4_is_installed=true;
+		quality:illicit_sw_C_5,sw_C_5_is_installed=true;
+		quality:illicit_sw_C_6,sw_C_6_is_installed=true;
+		quality:illicit_sw_C_7,sw_C_7_is_installed=true;
+		
+		quality:torrent_prog_A,prog_A_is_installed=true;
+
+		quality:illicit_sw_A_1,sw_A_1_is_installed=true;
+		quality:illicit_sw_A_2,sw_A_2_is_installed=true;
+		quality:illicit_sw_A_3,sw_A_3_is_installed=true;
 
 		topology:illicit_sw_C_6->illicit_sw_C_7,org;
 .
diff --git a/CG_Files/Employee_AC/dmca.xp b/CG_Files/Employee_AC/dmca.xp
index 25a9605..7af5dc6 100644
--- a/CG_Files/Employee_AC/dmca.xp
+++ b/CG_Files/Employee_AC/dmca.xp
@@ -1,84 +1,85 @@
-exploit remove_torrent_prog_A(torrent_prog_A)=
-	preconditions:
-		quality:torrent_prog_A,is_installed=true;
-	postconditions:
-		update quality:torrent_prog_A,is_installed=false;
-.
-
-
 exploit remove_torrent_prog_C(torrent_prog_C)=
 	preconditions:
-		quality:torrent_prog_C,is_installed=true;
+		quality:torrent_prog_C,prog_C_is_installed=true;
 	postconditions:
-		update quality:torrent_prog_C,is_installed=false;
-.
-
-exploit remove_illicit_sw_A_1(illicit_sw_A_1)=
-	preconditions:
-		quality:illicit_sw_A_1,is_installed=true;
-	postconditions:
-		update quality:illicit_sw_A_1,is_installed=false;
-.
-
-exploit remove_illicit_sw_A_2(illicit_sw_A_2)=
-	preconditions:
-		quality:illicit_sw_A_2,is_installed=true;
-	postconditions:
-		update quality:illicit_sw_A_2,is_installed=false;
-.
-
-exploit remove_illicit_sw_A_3(illicit_sw_A_3)=
-	preconditions:
-		quality:illicit_sw_A_3,is_installed=true;
-	postconditions:
-		update quality:illicit_sw_A_3,is_installed=false;
+		update quality:torrent_prog_C,prog_C_is_installed=false;
 .
 
 exploit remove_illicit_sw_C_1(illicit_sw_C_1)=
 	preconditions:
-		quality:illicit_sw_C_1,is_installed=true;
+		quality:illicit_sw_C_1,sw_C_1_is_installed=true;
 	postconditions:
-		update quality:illicit_sw_C_1,is_installed=false;
+		update quality:illicit_sw_C_1,sw_C_1_is_installed=false;
 .
 
 exploit remove_illicit_sw_C_2(illicit_sw_C_2)=
 	preconditions:
-		quality:illicit_sw_C_2,is_installed=true;
+		quality:illicit_sw_C_2,sw_C_2_is_installed=true;
 	postconditions:
-		update quality:illicit_sw_C_2,is_installed=false;
+		update quality:illicit_sw_C_2,sw_C_2_is_installed=false;
 .
 
 exploit remove_illicit_sw_C_3(illicit_sw_C_3)=
 	preconditions:
-		quality:illicit_sw_C_3,is_installed=true;
+		quality:illicit_sw_C_3,sw_C_3_is_installed=true;
 	postconditions:
-		update quality:illicit_sw_C_3,is_installed=false;
+		update quality:illicit_sw_C_3,sw_C_3_is_installed=false;
 .
 
 exploit remove_illicit_sw_C_4(illicit_sw_C_4)=
 	preconditions:
-		quality:illicit_sw_C_4,is_installed=true;
+		quality:illicit_sw_C_4,sw_C_4_is_installed=true;
 	postconditions:
-		update quality:illicit_sw_C_4,is_installed=false;
+		update quality:illicit_sw_C_4,sw_C_4_is_installed=false;
 .
 
 exploit remove_illicit_sw_C_5(illicit_sw_C_5)=
 	preconditions:
-		quality:illicit_sw_C_5,is_installed=true;
+		quality:illicit_sw_C_5,sw_C_5_is_installed=true;
 	postconditions:
-		update quality:illicit_sw_C_5,is_installed=false;
+		update quality:illicit_sw_C_5,sw_C_5_is_installed=false;
 .
 
 exploit remove_illicit_sw_C_6(illicit_sw_C_6)=
 	preconditions:
-		quality:illicit_sw_C_6,is_installed=true;
+		quality:illicit_sw_C_6,sw_C_6_is_installed=true;
 	postconditions:
-		update quality:illicit_sw_C_6,is_installed=false;
+		update quality:illicit_sw_C_6,sw_C_6_is_installed=false;
 .
 
 exploit remove_illicit_sw_C_7(illicit_sw_C_7)=
 	preconditions:
-		quality:illicit_sw_C_7,is_installed=true;
+		quality:illicit_sw_C_7,sw_C_7_is_installed=true;
 	postconditions:
-		update quality:illicit_sw_C_7,is_installed=false;
+		update quality:illicit_sw_C_7,sw_C_7_is_installed=false;
 .
+
+exploit remove_torrent_prog_A(torrent_prog_A)=
+	preconditions:
+		quality:torrent_prog_A,prog_A_is_installed=true;
+	postconditions:
+		update quality:torrent_prog_A,prog_A_is_installed=false;
+.
+
+exploit remove_illicit_sw_A_1(illicit_sw_A_1)=
+	preconditions:
+		quality:illicit_sw_A_1,sw_A_1_is_installed=true;
+	postconditions:
+		update quality:illicit_sw_A_1,sw_A_1_is_installed=false;
+.
+
+exploit remove_illicit_sw_A_2(illicit_sw_A_2)=
+	preconditions:
+		quality:illicit_sw_A_2,sw_A_2_is_installed=true;
+	postconditions:
+		update quality:illicit_sw_A_2,sw_A_2_is_installed=false;
+.
+
+exploit remove_illicit_sw_A_3(illicit_sw_A_3)=
+	preconditions:
+		quality:illicit_sw_A_3,sw_A_3_is_installed=true;
+	postconditions:
+		update quality:illicit_sw_A_3,sw_A_3_is_installed=false;
+.
+
+
diff --git a/CG_Files/Employee_AC/sync_dmca.xp b/CG_Files/Employee_AC/sync_dmca.xp
index da40d01..4085ef7 100644
--- a/CG_Files/Employee_AC/sync_dmca.xp
+++ b/CG_Files/Employee_AC/sync_dmca.xp
@@ -1,33 +1,34 @@
-uninstall group exploit remove_all_A(torrent_prog_A,illicit_sw_A_1,illicit_sw_A_2,illicit_sw_A_3)=
-	preconditions:
-		quality:torrent_prog_A,is_installed=true;
-		quality:illicit_sw_A_1,is_installed=true;
-		quality:illicit_sw_A_2,is_installed=true;
-		quality:illicit_sw_A_3,is_installed=true;
-	postconditions:
-		update quality:torrent_prog_A,is_installed=false;
-		update quality:illicit_sw_A_1,is_installed=false;
-		update quality:illicit_sw_A_2,is_installed=false;
-		update quality:illicit_sw_A_3,is_installed=false;
-.
-
 uninstall group exploit remove_all_C(torrent_prog_C,illicit_sw_C_1,illicit_sw_C_2,illicit_sw_C_3,illicit_sw_C_4,illicit_sw_C_5,illicit_sw_C_6,illicit_sw_C_7)=
 	preconditions:
-		quality:torrent_prog_C,is_installed=true;
-		quality:illicit_sw_C_1,is_installed=true;
-		quality:illicit_sw_C_2,is_installed=true;
-		quality:illicit_sw_C_3,is_installed=true;
-		quality:illicit_sw_C_4,is_installed=true;
-		quality:illicit_sw_C_5,is_installed=true;
-		quality:illicit_sw_C_6,is_installed=true;
-		quality:illicit_sw_C_7,is_installed=true;
+		quality:torrent_prog_C,prog_C_is_installed=true;
+		quality:illicit_sw_C_1,sw_C_1_is_installed=true;
+		quality:illicit_sw_C_2,sw_C_2_is_installed=true;
+		quality:illicit_sw_C_3,sw_C_3_is_installed=true;
+		quality:illicit_sw_C_4,sw_C_4_is_installed=true;
+		quality:illicit_sw_C_5,sw_C_5_is_installed=true;
+		quality:illicit_sw_C_6,sw_C_6_is_installed=true;
+		quality:illicit_sw_C_7,sw_C_7_is_installed=true;
 	postconditions:
-		update quality:torrent_prog_C,is_installed=false;
-		update quality:illicit_sw_C_1,is_installed=false;
-		update quality:illicit_sw_C_2,is_installed=false;
-		update quality:illicit_sw_C_3,is_installed=false;
-		update quality:illicit_sw_C_4,is_installed=false;
-		update quality:illicit_sw_C_5,is_installed=false;
-		update quality:illicit_sw_C_6,is_installed=false;
-		update quality:illicit_sw_C_7,is_installed=false;
+		quality:torrent_prog_C,prog_C_is_installed=false;
+		quality:illicit_sw_C_1,sw_C_1_is_installed=false;
+		quality:illicit_sw_C_2,sw_C_2_is_installed=false;
+		quality:illicit_sw_C_3,sw_C_3_is_installed=false;
+		quality:illicit_sw_C_4,sw_C_4_is_installed=false;
+		quality:illicit_sw_C_5,sw_C_5_is_installed=false;
+		quality:illicit_sw_C_6,sw_C_6_is_installed=false;
+		quality:illicit_sw_C_7,sw_C_7_is_installed=false;
 .
+
+uninstall group exploit remove_all_A(torrent_prog_A,illicit_sw_A_1,illicit_sw_A_2,illicit_sw_A_3)=
+	preconditions:
+		quality:torrent_prog_A,prog_A_is_installed=true;
+		quality:illicit_sw_A_1,sw_A_1_is_installed=true;
+		quality:illicit_sw_A_2,sw_A_2_is_installed=true;
+		quality:illicit_sw_A_3,sw_A_3_is_installed=true;
+	postconditions:
+		quality:torrent_prog_A,prog_A_is_installed=false;
+		quality:illicit_sw_A_1,sw_A_1_is_installed=false;
+		quality:illicit_sw_A_2,sw_A_2_is_installed=false;
+		quality:illicit_sw_A_3,sw_A_3_is_installed=false;
+.
+
diff --git a/CG_Files/Employee_B/dmca.nm b/CG_Files/Employee_B/dmca.nm
index dd65ced..cabb132 100644
--- a/CG_Files/Employee_B/dmca.nm
+++ b/CG_Files/Employee_B/dmca.nm
@@ -1,18 +1,18 @@
 network model =
-	assets:	
+	assets:		
 		torrent_prog_B;
 		illicit_sw_B_1;
 		illicit_sw_B_2;
 		illicit_sw_B_3;	
-		illicit_sw_B_4;		
+		illicit_sw_B_4;	
 
 	facts:
-		quality:torrent_prog_B,is_installed=true;
-	
-		quality:illicit_sw_B_1,is_installed=true;
-		quality:illicit_sw_B_2,is_installed=true;
-		quality:illicit_sw_B_3,is_installed=true;
-		quality:illicit_sw_B_4,is_installed=true;
+		quality:torrent_prog_B,prog_B_is_installed=true;
 
-		topology:illicit_sw_B_2->illicit_sw_B_3,org;
+		quality:illicit_sw_B_1,sw_B_1_is_installed=true;
+		quality:illicit_sw_B_2,sw_B_2_is_installed=true;
+		quality:illicit_sw_B_3,sw_B_3_is_installed=true;
+		quality:illicit_sw_B_4,sw_B_4_is_installed=true;
+
+		topology:illicit_sw_B_3->illicit_sw_B_4,org;
 .
diff --git a/CG_Files/Employee_B/dmca.xp b/CG_Files/Employee_B/dmca.xp
index e1a32db..b5cfddf 100644
--- a/CG_Files/Employee_B/dmca.xp
+++ b/CG_Files/Employee_B/dmca.xp
@@ -1,34 +1,34 @@
 exploit remove_torrent_prog_B(torrent_prog_B)=
 	preconditions:
-		quality:torrent_prog_B,is_installed=true;
+		quality:torrent_prog_B,prog_B_is_installed=true;
 	postconditions:
-		update quality:torrent_prog_B,is_installed=false;
+		update quality:torrent_prog_B,prog_B_is_installed=false;
 .
 
 exploit remove_illicit_sw_B_1(illicit_sw_B_1)=
 	preconditions:
-		quality:illicit_sw_B_1,is_installed=true;
+		quality:illicit_sw_B_1,sw_B_1_is_installed=true;
 	postconditions:
-		update quality:illicit_sw_B_1,is_installed=false;
+		update quality:illicit_sw_B_1,sw_B_1_is_installed=false;
 .
 
 exploit remove_illicit_sw_B_2(illicit_sw_B_2)=
 	preconditions:
-		quality:illicit_sw_B_2,is_installed=true;
+		quality:illicit_sw_B_2,sw_B_2_is_installed=true;
 	postconditions:
-		update quality:illicit_sw_B_2,is_installed=false;
+		update quality:illicit_sw_B_2,sw_B_2_is_installed=false;
 .
 
 exploit remove_illicit_sw_B_3(illicit_sw_B_3)=
 	preconditions:
-		quality:illicit_sw_B_3,is_installed=true;
+		quality:illicit_sw_B_3,sw_B_3_is_installed=true;
 	postconditions:
-		update quality:illicit_sw_B_3,is_installed=false;
+		update quality:illicit_sw_B_3,sw_B_3_is_installed=false;
 .
 
 exploit remove_illicit_sw_B_4(illicit_sw_B_4)=
 	preconditions:
-		quality:illicit_sw_B_4,is_installed=true;
+		quality:illicit_sw_B_4,sw_B_4_is_installed=true;
 	postconditions:
-		update quality:illicit_sw_B_4,is_installed=false;
+		update quality:illicit_sw_B_4,sw_B_4_is_installed=false;
 .
diff --git a/CG_Files/Employee_B/sync_dmca.xp b/CG_Files/Employee_B/sync_dmca.xp
index 97284c3..4df8441 100644
--- a/CG_Files/Employee_B/sync_dmca.xp
+++ b/CG_Files/Employee_B/sync_dmca.xp
@@ -1,14 +1,14 @@
 uninstall group exploit remove_all_B(torrent_prog_B,illicit_sw_B_1,illicit_sw_B_2,illicit_sw_B_3,illicit_sw_B_4)=
 	preconditions:
-		quality:torrent_prog_B,is_installed=true;
-		quality:illicit_sw_B_1,is_installed=true;
-		quality:illicit_sw_B_2,is_installed=true;
-		quality:illicit_sw_B_3,is_installed=true;
-		quality:illicit_sw_B_4,is_installed=true;
+		quality:torrent_prog_B,prog_B_is_installed=true;
+		quality:illicit_sw_B_1,sw_B_1_is_installed=true;
+		quality:illicit_sw_B_2,sw_B_2_is_installed=true;
+		quality:illicit_sw_B_3,sw_B_3_is_installed=true;
+		quality:illicit_sw_B_4,sw_B_4_is_installed=true;
 	postconditions:
-		update quality:torrent_prog_B,is_installed=false;
-		update quality:illicit_sw_B_1,is_installed=false;
-		update quality:illicit_sw_B_2,is_installed=false;
-		update quality:illicit_sw_B_3,is_installed=false;
-		update quality:illicit_sw_B_4,is_installed=false;
+		quality:torrent_prog_B,prog_B_is_installed=false;
+		quality:illicit_sw_B_1,sw_B_1_is_installed=false;
+		quality:illicit_sw_B_2,sw_B_2_is_installed=false;
+		quality:illicit_sw_B_3,sw_B_3_is_installed=false;
+		quality:illicit_sw_B_4,sw_B_4_is_installed=false;
 .
diff --git a/CG_Files/Employee_BC/dmca.nm b/CG_Files/Employee_BC/dmca.nm
index c4d898b..45ba57f 100644
--- a/CG_Files/Employee_BC/dmca.nm
+++ b/CG_Files/Employee_BC/dmca.nm
@@ -1,11 +1,5 @@
 network model =
-	assets:
-		torrent_prog_B;
-		illicit_sw_B_1;
-		illicit_sw_B_2;
-		illicit_sw_B_3;	
-		illicit_sw_B_4;		
-		
+	assets:		
 		torrent_prog_C;
 		illicit_sw_C_1;
 		illicit_sw_C_2;
@@ -14,23 +8,30 @@ network model =
 		illicit_sw_C_5;	
 		illicit_sw_C_6;	
 		illicit_sw_C_7;	
+		
+		torrent_prog_B;
+		illicit_sw_B_1;
+		illicit_sw_B_2;
+		illicit_sw_B_3;	
+		illicit_sw_B_4;	
 
 	facts:
-		quality:torrent_prog_B,is_installed=true;
-		quality:torrent_prog_C,is_installed=true;
-	
-		quality:illicit_sw_B_1,is_installed=true;
-		quality:illicit_sw_B_2,is_installed=true;
-		quality:illicit_sw_B_3,is_installed=true;
-		quality:illicit_sw_B_4,is_installed=true;
+		quality:torrent_prog_C,prog_C_is_installed=true;
 
-		quality:illicit_sw_C_1,is_installed=true;
-		quality:illicit_sw_C_2,is_installed=true;
-		quality:illicit_sw_C_3,is_installed=true;
-		quality:illicit_sw_C_4,is_installed=true;
-		quality:illicit_sw_C_5,is_installed=true;
-		quality:illicit_sw_C_6,is_installed=true;
-		quality:illicit_sw_C_7,is_installed=true;
+		quality:illicit_sw_C_1,sw_C_1_is_installed=true;
+		quality:illicit_sw_C_2,sw_C_2_is_installed=true;
+		quality:illicit_sw_C_3,sw_C_3_is_installed=true;
+		quality:illicit_sw_C_4,sw_C_4_is_installed=true;
+		quality:illicit_sw_C_5,sw_C_5_is_installed=true;
+		quality:illicit_sw_C_6,sw_C_6_is_installed=true;
+		quality:illicit_sw_C_7,sw_C_7_is_installed=true;
+		
+		quality:torrent_prog_B,prog_B_is_installed=true;
+
+		quality:illicit_sw_B_1,sw_B_1_is_installed=true;
+		quality:illicit_sw_B_2,sw_B_2_is_installed=true;
+		quality:illicit_sw_B_3,sw_B_3_is_installed=true;
+		quality:illicit_sw_B_4,sw_B_4_is_installed=true;
 
 		topology:illicit_sw_C_6->illicit_sw_C_7,org;
 .
diff --git a/CG_Files/Employee_BC/dmca.xp b/CG_Files/Employee_BC/dmca.xp
index 2596872..9516e2c 100644
--- a/CG_Files/Employee_BC/dmca.xp
+++ b/CG_Files/Employee_BC/dmca.xp
@@ -1,92 +1,91 @@
-
-
-exploit remove_torrent_prog_B(torrent_prog_B)=
-	preconditions:
-		quality:torrent_prog_B,is_installed=true;
-	postconditions:
-		update quality:torrent_prog_B,is_installed=false;
-.
-
 exploit remove_torrent_prog_C(torrent_prog_C)=
 	preconditions:
-		quality:torrent_prog_C,is_installed=true;
+		quality:torrent_prog_C,prog_C_is_installed=true;
 	postconditions:
-		update quality:torrent_prog_C,is_installed=false;
-.
-
-exploit remove_illicit_sw_B_1(illicit_sw_B_1)=
-	preconditions:
-		quality:illicit_sw_B_1,is_installed=true;
-	postconditions:
-		update quality:illicit_sw_B_1,is_installed=false;
-.
-
-exploit remove_illicit_sw_B_2(illicit_sw_B_2)=
-	preconditions:
-		quality:illicit_sw_B_2,is_installed=true;
-	postconditions:
-		update quality:illicit_sw_B_2,is_installed=false;
-.
-
-exploit remove_illicit_sw_B_3(illicit_sw_B_3)=
-	preconditions:
-		quality:illicit_sw_B_3,is_installed=true;
-	postconditions:
-		update quality:illicit_sw_B_3,is_installed=false;
-.
-
-exploit remove_illicit_sw_B_4(illicit_sw_B_4)=
-	preconditions:
-		quality:illicit_sw_B_4,is_installed=true;
-	postconditions:
-		update quality:illicit_sw_B_4,is_installed=false;
+		update quality:torrent_prog_C,prog_C_is_installed=false;
 .
 
 exploit remove_illicit_sw_C_1(illicit_sw_C_1)=
 	preconditions:
-		quality:illicit_sw_C_1,is_installed=true;
+		quality:illicit_sw_C_1,sw_C_1_is_installed=true;
 	postconditions:
-		update quality:illicit_sw_C_1,is_installed=false;
+		update quality:illicit_sw_C_1,sw_C_1_is_installed=false;
 .
 
 exploit remove_illicit_sw_C_2(illicit_sw_C_2)=
 	preconditions:
-		quality:illicit_sw_C_2,is_installed=true;
+		quality:illicit_sw_C_2,sw_C_2_is_installed=true;
 	postconditions:
-		update quality:illicit_sw_C_2,is_installed=false;
+		update quality:illicit_sw_C_2,sw_C_2_is_installed=false;
 .
 
 exploit remove_illicit_sw_C_3(illicit_sw_C_3)=
 	preconditions:
-		quality:illicit_sw_C_3,is_installed=true;
+		quality:illicit_sw_C_3,sw_C_3_is_installed=true;
 	postconditions:
-		update quality:illicit_sw_C_3,is_installed=false;
+		update quality:illicit_sw_C_3,sw_C_3_is_installed=false;
 .
 
 exploit remove_illicit_sw_C_4(illicit_sw_C_4)=
 	preconditions:
-		quality:illicit_sw_C_4,is_installed=true;
+		quality:illicit_sw_C_4,sw_C_4_is_installed=true;
 	postconditions:
-		update quality:illicit_sw_C_4,is_installed=false;
+		update quality:illicit_sw_C_4,sw_C_4_is_installed=false;
 .
 
 exploit remove_illicit_sw_C_5(illicit_sw_C_5)=
 	preconditions:
-		quality:illicit_sw_C_5,is_installed=true;
+		quality:illicit_sw_C_5,sw_C_5_is_installed=true;
 	postconditions:
-		update quality:illicit_sw_C_5,is_installed=false;
+		update quality:illicit_sw_C_5,sw_C_5_is_installed=false;
 .
 
 exploit remove_illicit_sw_C_6(illicit_sw_C_6)=
 	preconditions:
-		quality:illicit_sw_C_6,is_installed=true;
+		quality:illicit_sw_C_6,sw_C_6_is_installed=true;
 	postconditions:
-		update quality:illicit_sw_C_6,is_installed=false;
+		update quality:illicit_sw_C_6,sw_C_6_is_installed=false;
 .
 
 exploit remove_illicit_sw_C_7(illicit_sw_C_7)=
 	preconditions:
-		quality:illicit_sw_C_7,is_installed=true;
+		quality:illicit_sw_C_7,sw_C_7_is_installed=true;
 	postconditions:
-		update quality:illicit_sw_C_7,is_installed=false;
+		update quality:illicit_sw_C_7,sw_C_7_is_installed=false;
 .
+
+exploit remove_torrent_prog_B(torrent_prog_B)=
+	preconditions:
+		quality:torrent_prog_B,prog_B_is_installed=true;
+	postconditions:
+		update quality:torrent_prog_B,prog_B_is_installed=false;
+.
+
+exploit remove_illicit_sw_B_1(illicit_sw_B_1)=
+	preconditions:
+		quality:illicit_sw_B_1,sw_B_1_is_installed=true;
+	postconditions:
+		update quality:illicit_sw_B_1,sw_B_1_is_installed=false;
+.
+
+exploit remove_illicit_sw_B_2(illicit_sw_B_2)=
+	preconditions:
+		quality:illicit_sw_B_2,sw_B_2_is_installed=true;
+	postconditions:
+		update quality:illicit_sw_B_2,sw_B_2_is_installed=false;
+.
+
+exploit remove_illicit_sw_B_3(illicit_sw_B_3)=
+	preconditions:
+		quality:illicit_sw_B_3,sw_B_3_is_installed=true;
+	postconditions:
+		update quality:illicit_sw_B_3,sw_B_3_is_installed=false;
+.
+
+exploit remove_illicit_sw_B_4(illicit_sw_B_4)=
+	preconditions:
+		quality:illicit_sw_B_4,sw_B_4_is_installed=true;
+	postconditions:
+		update quality:illicit_sw_B_4,sw_B_4_is_installed=false;
+.
+
diff --git a/CG_Files/Employee_BC/sync_dmca.xp b/CG_Files/Employee_BC/sync_dmca.xp
index e5c18f7..d4401a5 100644
--- a/CG_Files/Employee_BC/sync_dmca.xp
+++ b/CG_Files/Employee_BC/sync_dmca.xp
@@ -1,35 +1,36 @@
-uninstall group exploit remove_all_B(torrent_prog_B,illicit_sw_B_1,illicit_sw_B_2,illicit_sw_B_3,illicit_sw_B_4)=
-	preconditions:
-		quality:torrent_prog_B,is_installed=true;
-		quality:illicit_sw_B_1,is_installed=true;
-		quality:illicit_sw_B_2,is_installed=true;
-		quality:illicit_sw_B_3,is_installed=true;
-		quality:illicit_sw_B_4,is_installed=true;
-	postconditions:
-		update quality:torrent_prog_B,is_installed=false;
-		update quality:illicit_sw_B_1,is_installed=false;
-		update quality:illicit_sw_B_2,is_installed=false;
-		update quality:illicit_sw_B_3,is_installed=false;
-		update quality:illicit_sw_B_4,is_installed=false;
-.
-
 uninstall group exploit remove_all_C(torrent_prog_C,illicit_sw_C_1,illicit_sw_C_2,illicit_sw_C_3,illicit_sw_C_4,illicit_sw_C_5,illicit_sw_C_6,illicit_sw_C_7)=
 	preconditions:
-		quality:torrent_prog_C,is_installed=true;
-		quality:illicit_sw_C_1,is_installed=true;
-		quality:illicit_sw_C_2,is_installed=true;
-		quality:illicit_sw_C_3,is_installed=true;
-		quality:illicit_sw_C_4,is_installed=true;
-		quality:illicit_sw_C_5,is_installed=true;
-		quality:illicit_sw_C_6,is_installed=true;
-		quality:illicit_sw_C_7,is_installed=true;
+		quality:torrent_prog_C,prog_C_is_installed=true;
+		quality:illicit_sw_C_1,sw_C_1_is_installed=true;
+		quality:illicit_sw_C_2,sw_C_2_is_installed=true;
+		quality:illicit_sw_C_3,sw_C_3_is_installed=true;
+		quality:illicit_sw_C_4,sw_C_4_is_installed=true;
+		quality:illicit_sw_C_5,sw_C_5_is_installed=true;
+		quality:illicit_sw_C_6,sw_C_6_is_installed=true;
+		quality:illicit_sw_C_7,sw_C_7_is_installed=true;
 	postconditions:
-		update quality:torrent_prog_C,is_installed=false;
-		update quality:illicit_sw_C_1,is_installed=false;
-		update quality:illicit_sw_C_2,is_installed=false;
-		update quality:illicit_sw_C_3,is_installed=false;
-		update quality:illicit_sw_C_4,is_installed=false;
-		update quality:illicit_sw_C_5,is_installed=false;
-		update quality:illicit_sw_C_6,is_installed=false;
-		update quality:illicit_sw_C_7,is_installed=false;
+		quality:torrent_prog_C,prog_C_is_installed=false;
+		quality:illicit_sw_C_1,sw_C_1_is_installed=false;
+		quality:illicit_sw_C_2,sw_C_2_is_installed=false;
+		quality:illicit_sw_C_3,sw_C_3_is_installed=false;
+		quality:illicit_sw_C_4,sw_C_4_is_installed=false;
+		quality:illicit_sw_C_5,sw_C_5_is_installed=false;
+		quality:illicit_sw_C_6,sw_C_6_is_installed=false;
+		quality:illicit_sw_C_7,sw_C_7_is_installed=false;
 .
+
+uninstall group exploit remove_all_B(torrent_prog_B,illicit_sw_B_1,illicit_sw_B_2,illicit_sw_B_3,illicit_sw_B_4)=
+	preconditions:
+		quality:torrent_prog_B,prog_B_is_installed=true;
+		quality:illicit_sw_B_1,sw_B_1_is_installed=true;
+		quality:illicit_sw_B_2,sw_B_2_is_installed=true;
+		quality:illicit_sw_B_3,sw_B_3_is_installed=true;
+		quality:illicit_sw_B_4,sw_B_4_is_installed=true;
+	postconditions:
+		quality:torrent_prog_B,prog_B_is_installed=false;
+		quality:illicit_sw_B_1,sw_B_1_is_installed=false;
+		quality:illicit_sw_B_2,sw_B_2_is_installed=false;
+		quality:illicit_sw_B_3,sw_B_3_is_installed=false;
+		quality:illicit_sw_B_4,sw_B_4_is_installed=false;
+.
+
diff --git a/CG_Files/Employee_C/dmca.nm b/CG_Files/Employee_C/dmca.nm
index 5fd7d74..3529d98 100644
--- a/CG_Files/Employee_C/dmca.nm
+++ b/CG_Files/Employee_C/dmca.nm
@@ -10,15 +10,15 @@ network model =
 		illicit_sw_C_7;	
 
 	facts:
-		quality:torrent_prog_C,is_installed=true;
+		quality:torrent_prog_C,prog_C_is_installed=true;
 
-		quality:illicit_sw_C_1,is_installed=true;
-		quality:illicit_sw_C_2,is_installed=true;
-		quality:illicit_sw_C_3,is_installed=true;
-		quality:illicit_sw_C_4,is_installed=true;
-		quality:illicit_sw_C_5,is_installed=true;
-		quality:illicit_sw_C_6,is_installed=true;
-		quality:illicit_sw_C_7,is_installed=true;
+		quality:illicit_sw_C_1,sw_C_1_is_installed=true;
+		quality:illicit_sw_C_2,sw_C_2_is_installed=true;
+		quality:illicit_sw_C_3,sw_C_3_is_installed=true;
+		quality:illicit_sw_C_4,sw_C_4_is_installed=true;
+		quality:illicit_sw_C_5,sw_C_5_is_installed=true;
+		quality:illicit_sw_C_6,sw_C_6_is_installed=true;
+		quality:illicit_sw_C_7,sw_C_7_is_installed=true;
 
 		topology:illicit_sw_C_6->illicit_sw_C_7,org;
 .
diff --git a/CG_Files/Employee_C/dmca.xp b/CG_Files/Employee_C/dmca.xp
index 866cea3..d94d79c 100644
--- a/CG_Files/Employee_C/dmca.xp
+++ b/CG_Files/Employee_C/dmca.xp
@@ -1,55 +1,55 @@
 exploit remove_torrent_prog_C(torrent_prog_C)=
 	preconditions:
-		quality:torrent_prog_C,is_installed=true;
+		quality:torrent_prog_C,prog_C_is_installed=true;
 	postconditions:
-		update quality:torrent_prog_C,is_installed=false;
+		update quality:torrent_prog_C,prog_C_is_installed=false;
 .
 
 exploit remove_illicit_sw_C_1(illicit_sw_C_1)=
 	preconditions:
-		quality:illicit_sw_C_1,is_installed=true;
+		quality:illicit_sw_C_1,sw_C_1_is_installed=true;
 	postconditions:
-		update quality:illicit_sw_C_1,is_installed=false;
+		update quality:illicit_sw_C_1,sw_C_1_is_installed=false;
 .
 
 exploit remove_illicit_sw_C_2(illicit_sw_C_2)=
 	preconditions:
-		quality:illicit_sw_C_2,is_installed=true;
+		quality:illicit_sw_C_2,sw_C_2_is_installed=true;
 	postconditions:
-		update quality:illicit_sw_C_2,is_installed=false;
+		update quality:illicit_sw_C_2,sw_C_2_is_installed=false;
 .
 
 exploit remove_illicit_sw_C_3(illicit_sw_C_3)=
 	preconditions:
-		quality:illicit_sw_C_3,is_installed=true;
+		quality:illicit_sw_C_3,sw_C_3_is_installed=true;
 	postconditions:
-		update quality:illicit_sw_C_3,is_installed=false;
+		update quality:illicit_sw_C_3,sw_C_3_is_installed=false;
 .
 
 exploit remove_illicit_sw_C_4(illicit_sw_C_4)=
 	preconditions:
-		quality:illicit_sw_C_4,is_installed=true;
+		quality:illicit_sw_C_4,sw_C_4_is_installed=true;
 	postconditions:
-		update quality:illicit_sw_C_4,is_installed=false;
+		update quality:illicit_sw_C_4,sw_C_4_is_installed=false;
 .
 
 exploit remove_illicit_sw_C_5(illicit_sw_C_5)=
 	preconditions:
-		quality:illicit_sw_C_5,is_installed=true;
+		quality:illicit_sw_C_5,sw_C_5_is_installed=true;
 	postconditions:
-		update quality:illicit_sw_C_5,is_installed=false;
+		update quality:illicit_sw_C_5,sw_C_5_is_installed=false;
 .
 
 exploit remove_illicit_sw_C_6(illicit_sw_C_6)=
 	preconditions:
-		quality:illicit_sw_C_6,is_installed=true;
+		quality:illicit_sw_C_6,sw_C_6_is_installed=true;
 	postconditions:
-		update quality:illicit_sw_C_6,is_installed=false;
+		update quality:illicit_sw_C_6,sw_C_6_is_installed=false;
 .
 
 exploit remove_illicit_sw_C_7(illicit_sw_C_7)=
 	preconditions:
-		quality:illicit_sw_C_7,is_installed=true;
+		quality:illicit_sw_C_7,sw_C_7_is_installed=true;
 	postconditions:
-		update quality:illicit_sw_C_7,is_installed=false;
+		update quality:illicit_sw_C_7,sw_C_7_is_installed=false;
 .
diff --git a/CG_Files/Employee_C/sync_dmca.xp b/CG_Files/Employee_C/sync_dmca.xp
index 97ca8c8..1c420a6 100644
--- a/CG_Files/Employee_C/sync_dmca.xp
+++ b/CG_Files/Employee_C/sync_dmca.xp
@@ -1,20 +1,20 @@
 uninstall group exploit remove_all_C(torrent_prog_C,illicit_sw_C_1,illicit_sw_C_2,illicit_sw_C_3,illicit_sw_C_4,illicit_sw_C_5,illicit_sw_C_6,illicit_sw_C_7)=
 	preconditions:
-		quality:torrent_prog_C,is_installed=true;
-		quality:illicit_sw_C_1,is_installed=true;
-		quality:illicit_sw_C_2,is_installed=true;
-		quality:illicit_sw_C_3,is_installed=true;
-		quality:illicit_sw_C_4,is_installed=true;
-		quality:illicit_sw_C_5,is_installed=true;
-		quality:illicit_sw_C_6,is_installed=true;
-		quality:illicit_sw_C_7,is_installed=true;
+		quality:torrent_prog_C,prog_C_is_installed=true;
+		quality:illicit_sw_C_1,sw_C_1_is_installed=true;
+		quality:illicit_sw_C_2,sw_C_2_is_installed=true;
+		quality:illicit_sw_C_3,sw_C_3_is_installed=true;
+		quality:illicit_sw_C_4,sw_C_4_is_installed=true;
+		quality:illicit_sw_C_5,sw_C_5_is_installed=true;
+		quality:illicit_sw_C_6,sw_C_6_is_installed=true;
+		quality:illicit_sw_C_7,sw_C_7_is_installed=true;
 	postconditions:
-		update quality:torrent_prog_C,is_installed=false;
-		update quality:illicit_sw_C_1,is_installed=false;
-		update quality:illicit_sw_C_2,is_installed=false;
-		update quality:illicit_sw_C_3,is_installed=false;
-		update quality:illicit_sw_C_4,is_installed=false;
-		update quality:illicit_sw_C_5,is_installed=false;
-		update quality:illicit_sw_C_6,is_installed=false;
-		update quality:illicit_sw_C_7,is_installed=false;
+		quality:torrent_prog_C,prog_C_is_installed=false;
+		quality:illicit_sw_C_1,sw_C_1_is_installed=false;
+		quality:illicit_sw_C_2,sw_C_2_is_installed=false;
+		quality:illicit_sw_C_3,sw_C_3_is_installed=false;
+		quality:illicit_sw_C_4,sw_C_4_is_installed=false;
+		quality:illicit_sw_C_5,sw_C_5_is_installed=false;
+		quality:illicit_sw_C_6,sw_C_6_is_installed=false;
+		quality:illicit_sw_C_7,sw_C_7_is_installed=false;
 .