diff --git a/r2sol.cc b/r2sol.cc
index 695ecd230043c85ebc5c38ff88e557b7cbddc3be..4032b7f52db4258c65ceecb7d19d9f85c769c8cd 100644
--- a/r2sol.cc
+++ b/r2sol.cc
@@ -756,7 +756,7 @@ int tend_ongoing_move[NMAX];
 bool OverlapsOngoingMove(int t1, int t2, int node, const short int covered_by[][MAXNODES], const int is_covered[][MAXNODES], int is_covered_idx, const Path tmp_path[], short int tmax_at_poz_node[]) {
 
   //if (t1 < tend_ongoing_move[node]) return true;
-  //***if (t2 <= tend_ongoing_move[node]) return true;
+  if (t2 <= tend_ongoing_move[node]) return true;
 
   //return false;
 
@@ -1301,13 +1301,13 @@ void RandomPermutations(int tid, int ntries) {
   }
 
   for (int trial = 1; trial <= ntries; ++trial) {
-    if (tid == 0 && trial <= 1) {
+    if (tid == 0 && trial <= 2) {
       for (int i = 0; i < N; ++i) perm_tid[i] = shpaths_sorted[i].second;
       reverse(shpaths_sorted.begin(), shpaths_sorted.end());
     } else {
       for (int i = 0; i < N; ++i) pused_tid[i] = 0;
       int idx = 0;
-      if (0&&(trial & 1) == 1) {
+      if ((trial & 1) == 1) {
         for (int cturns = MAX_CTURNS - 1; cturns >= 0; --cturns) {
           const auto& cturns_agents_cturns = cturns_agents[cturns];
           const auto& num_cturns_agents_cturns = num_cturns_agents[cturns];
@@ -2182,8 +2182,8 @@ void GetMoves(const char* testid, bool replay_mode = false) {
     ReinitDataStructures();
     ComputeShortestPaths();
   }
-  SCORE_EXPONENT1 = 0.5;//0.5;//2.0;
-  SCORE_EXPONENT2 = 0.5;//0.5;//4.0;
+  SCORE_EXPONENT1 = 0.5;//0.5;
+  SCORE_EXPONENT2 = 0.5;//0.5;
   DBG(2, "testid=%s TINIT=%d: resc=%d nda=%d npl=%d\n", testid, TINIT, reschedule, num_done_agents, num_planned);
   if (reschedule) {
     if (TINIT >= MIN_TINIT_FOR_SAVE_DATA_FOR_REPLAY) SaveDataForReplay(testid);
@@ -2195,11 +2195,11 @@ void GetMoves(const char* testid, bool replay_mode = false) {
     const int kMaxNumAdjustIPathsWithoutFullPlanRegenartion = 3;//5;
     const bool full_regenerate_paths = !updated_paths_ok || num_adjust_ipaths_without_full_plan_regeneration > kMaxNumAdjustIPathsWithoutFullPlanRegenartion;
     if (full_regenerate_paths) {
-      RegenerateFullPlan(4, TINIT == 0 ? 20 : /*8*/9);
+      RegenerateFullPlan(4, TINIT == 0 ? 20 : /*9*/10);
       num_adjust_ipaths_without_full_plan_regeneration = 0;
     } else {
       assert(TINIT >= 1);
-      RegenerateFullPlan(/*1*/2, 1);
+      RegenerateFullPlan(2, /*1*/ 2);
     }
     if (TINIT >= 1 && any_best_solution_updates) AdjustIPaths();
   }