diff --git a/bn_persona_model/new_persona_model.bif b/bn_persona_model/new_persona_model.bif
index 30c0d9d40d9b9653c0abc4827eb59782e5fce314..224554476f9138f437643af56101cabca8bf534f 100644
--- a/bn_persona_model/new_persona_model.bif
+++ b/bn_persona_model/new_persona_model.bif
@@ -66,8 +66,9 @@ probability ( reactivity | attention ) {
   (medium)  0.2, 0.5, 0.3;
   (high)  0.1, 0.2, 0.7;
 }
-#CPDS 7
-probability (user_action | memory, reactivity) {
+
+
+probability (user_react_time | memory, reactivity) {
 (low, slow)  0.2, 0.5, 0.3;
 (low, medium) 0.3, 0.5, 0.2;
 (low, fast) 0.4, 0.5, 0.1;
@@ -78,8 +79,28 @@ probability (user_action | memory, reactivity) {
 (high, medium) 0.6, 0.3, 0.1;
 (high, fast) 0.8, 0.2, 0.0;
 }
+probability (robot_feedback | user_react_time) {
+  (slow) 0.8, 0.2;
+  (normal) 0.5, 0.5;
+  (fast) 0.2, 0.8;
+}
+probability (robot_assistance | user_react_time) {
+  (slow) 0.05 0.1 0.15 0.3 0.4;
+  (normal) 0.4 0.3 0.2 0.05 0.05;
+  (fast) 0.4 0.4 0.1 0.05 0.05;
+}
+probability (game_state | user_react_time)  {
+   (slow) 0.2, 0.4, 0.4;
+   (normal) 0.4, 0.4, 0.2;
+   (fast) 0.6, 0.3, 0.1;
+}
+probability (attempt | user_react_time)  {
+   (slow) 0.1, 0.2, 0.3, 0.4;
+   (normal) 0.5, 0.3, 0.15, 0.05;
+   (fast) 0.4, 0.3, 0.2, 0.1;
+}
 
-probability (user_react_time | memory, reactivity) {
+probability (user_action | memory, reactivity) {
 (low, slow)  0.2, 0.5, 0.3;
 (low, medium) 0.3, 0.5, 0.2;
 (low, fast) 0.4, 0.5, 0.1;
@@ -90,53 +111,23 @@ probability (user_react_time | memory, reactivity) {
 (high, medium) 0.6, 0.3, 0.1;
 (high, fast) 0.8, 0.2, 0.0;
 }
-
-
-#CPDS 5
 probability (robot_feedback | user_action) {
   (correct) 0.8, 0.2;
   (wrong) 0.5, 0.5;
   (timeout) 0.2, 0.8;
 }
-#CPDS 6
 probability (robot_assistance | user_action) {
   (correct) 0.05 0.1 0.15 0.3 0.4;
   (wrong) 0.4 0.3 0.2 0.05 0.05;
   (timeout) 0.4 0.4 0.1 0.05 0.05;
 }
-#CPDS 2
 probability (game_state | user_action)  {
    (correct) 0.2, 0.4, 0.4;
    (wrong) 0.4, 0.4, 0.2;
    (timeout) 0.6, 0.3, 0.1;
 }
-#CPDS 0
 probability (attempt | user_action)  {
    (correct) 0.1, 0.2, 0.3, 0.4;
    (wrong) 0.5, 0.3, 0.15, 0.05;
    (timeout) 0.4, 0.3, 0.2, 0.1;
-}
-
-probability (robot_feedback | user_react_time) {
-  (slow) 0.8, 0.2;
-  (normal) 0.5, 0.5;
-  (fast) 0.2, 0.8;
-}
-#CPDS 6
-probability (robot_assistance | user_react_time) {
-  (slow) 0.05 0.1 0.15 0.3 0.4;
-  (normal) 0.4 0.3 0.2 0.05 0.05;
-  (fast) 0.4 0.4 0.1 0.05 0.05;
-}
-#CPDS 2
-probability (game_state | user_react_time)  {
-   (slow) 0.2, 0.4, 0.4;
-   (normal) 0.4, 0.4, 0.2;
-   (fast) 0.6, 0.3, 0.1;
-}
-#CPDS 0
-probability (attempt | user_react_time)  {
-   (slow) 0.1, 0.2, 0.3, 0.4;
-   (normal) 0.5, 0.3, 0.15, 0.05;
-   (fast) 0.4, 0.3, 0.2, 0.1;
-}
+}
\ No newline at end of file
diff --git a/bn_robot_model/robot_model.bif b/bn_robot_model/robot_model.bif
index aacc1e005dc5d0b7a564f954a4b4fef6912d3ba3..46ba779fe82251a70d499858c7bf35a707a15a05 100644
--- a/bn_robot_model/robot_model.bif
+++ b/bn_robot_model/robot_model.bif
@@ -80,64 +80,27 @@ probability (robot_feedback | user_capability) {
 (severe) 0.8, 0.2;
 }
 
-
-probability (robot_assistance | game_state, attempt, user_capability) {
-  (beg, att_1, very_mild)  0.25, 0.25, 0.2, 0.2, 0.1;
-  (mid, att_1, very_mild)  0.4, 0.3, 0.2, 0.1, 0.0;
-  (end, att_1, very_mild)  0.5, 0.3, 0.2, 0.0, 0.0;
-  (beg, att_2, very_mild)  0.4, 0.3, 0.2, 0.1, 0.0;
-  (mid, att_2, very_mild)  0.5, 0.3, 0.1, 0.1, 0.0;
-  (end, att_2, very_mild)  0.6, 0.3, 0.1, 0.0, 0.0;
-  (beg, att_3, very_mild)  0.4, 0.4, 0.2, 0.0, 0.0;
-  (mid, att_3, very_mild)  0.5, 0.3, 0.2, 0.0, 0.0;
-  (end, att_3, very_mild)  0.6, 0.3, 0.1, 0.0, 0.0;
-  (beg, att_4, very_mild)  0.5, 0.3, 0.2, 0.0, 0.0;
-  (mid, att_4, very_mild)  0.6, 0.3, 0.1, 0.0, 0.0;
-  (end, att_4, very_mild)  0.7, 0.2, 0.1, 0.0, 0.0;
-
-  (beg, att_1, mild)  0.1, 0.2, 0.3, 0.3, 0.1;
-  (mid, att_1, mild)  0.4, 0.3, 0.2, 0.1, 0.0;
-  (end, att_1, mild)  0.5, 0.3, 0.2, 0.0, 0.0;
-  (beg, att_2, mild)  0.4, 0.3, 0.2, 0.1, 0.0;
-  (mid, att_2, mild)  0.5, 0.3, 0.1, 0.1, 0.0;
-  (end, att_2, mild)  0.6, 0.3, 0.1, 0.0, 0.0;
-  (beg, att_3, mild)  0.4, 0.4, 0.2, 0.0, 0.0;
-  (mid, att_3, mild)  0.5, 0.3, 0.2, 0.0, 0.0;
-  (end, att_3, mild)  0.6, 0.3, 0.1, 0.0, 0.0;
-  (beg, att_4, mild)  0.5, 0.3, 0.2, 0.0, 0.0;
-  (mid, att_4, mild)  0.6, 0.3, 0.1, 0.0, 0.0;
-  (end, att_4, mild)  0.7, 0.2, 0.1, 0.0, 0.0;
-
-  (beg, att_1, severe)  0.1, 0.2, 0.3, 0.25, 0.15;
-  (mid, att_1, severe)  0.4, 0.3, 0.2, 0.1, 0.0;
-  (end, att_1, severe)  0.5, 0.3, 0.2, 0.0, 0.0;
-  (beg, att_2, severe)  0.4, 0.3, 0.2, 0.1, 0.0;
-  (mid, att_2, severe)  0.5, 0.3, 0.1, 0.1, 0.0;
-  (end, att_2, severe)  0.6, 0.3, 0.1, 0.0, 0.0;
-  (beg, att_3, severe)  0.4, 0.4, 0.2, 0.0, 0.0;
-  (mid, att_3, severe)  0.5, 0.3, 0.2, 0.0, 0.0;
-  (end, att_3, severe)  0.6, 0.3, 0.1, 0.0, 0.0;
-  (beg, att_4, severe)  0.5, 0.3, 0.2, 0.0, 0.0;
-  (mid, att_4, severe)  0.6, 0.3, 0.1, 0.0, 0.0;
-  (end, att_4, severe)  0.7, 0.2, 0.1, 0.0, 0.0;
-
+probability (game_state | robot_assistance) {
+(lev_0) 0.1, 0.3, 0.6;
+(lev_1) 0.2, 0.3, 0.5;
+(lev_2) 0.4, 0.3, 0.3;
+(lev_3) 0.4, 0.3, 0.3;
+(lev_4) 0.5, 0.4, 0.1;
 }
 
-probability (robot_feedback | game_state, attempt) {
-  (beg, att_1) 0.5, 0.5;
-  (mid, att_1) 0.4, 0.6;
-  (end, att_1) 0.3, 0.7;
-
-  (beg, att_2) 0.4, 0.6;
-  (mid, att_2) 0.3, 0.7;
-  (end, att_2) 0.2, 0.8;
-
-  (beg, att_3) 0.3, 0.7;
-  (mid, att_3) 0.2, 0.8;
-  (end, att_3) 0.1, 0.9;
-
-  (beg, att_4) 0.2, 0.8;
-  (mid, att_4) 0.1, 0.9;
-  (end, att_4) 0.0, 1.0;
+probability (attempt | robot_assistance) {
+(lev_0) 0.1, 0.2, 0.3, 0.4;
+(lev_1) 0.1, 0.2, 0.3, 0.4;
+(lev_2) 0.2, 0.2, 0.2, 0.4;
+(lev_3) 0.25, 0.25, 0.25, 0.25;
+(lev_4) 0.1, 0.25, 0.25, 0.4;
+}
 
+probability (game_state | robot_feedback) {
+(no) 0.2, 0.4, 0.4;
+(yes) 0.4, 0.4, 0.2;
+}
+probability (attempt | robot_feedback)  {
+(no) 0.1,0.15, 0.25, 0.5;
+(yes) 0.4, 0.3, 0.2, 0.1;
 }