@@ -15,6 +15,8 @@ do{
     swapped = false;    // initialize swapped
     // a single comb over the input list
     for( var i=0; i+gap < N; i++ ){
+        tracer._select(i)._select(i+gap)._wait();
+
         if( D[i] > D[i+gap] ){
             logger._print('swap ' + D[i] + ' and ' + D[i+gap]);     // log swap event
 
@@ -27,5 +29,6 @@ do{
 
             swapped = true;     // Flag swapped has happened and list is not guaranteed sorted
         }
+        tracer._deselect(i)._deselect(i+gap);
     } // End of combing
 } while( gap!=1 || swapped  )
@@ -1,57 +1,72 @@
-logger._print( 'original array = [' + D.join(', ') + ']' );
+logger._print('original array = [' + D.join(', ') + ']');
 var N = D.length;
 var writes = 0;
 var pos;
 var item;
 var temp;
-for( var cycleStart=0; cycleStart<=N-2; cycleStart++ ){
-    item = D[cycleStart];
-    pos = cycleStart;
-    for( var i=cycleStart+1; i<=N-1; i++ ){
-        if( D[i]<item ){
-            pos++;
-        }
-    }
-    if( pos == cycleStart ){
-        continue;
-    }
-    while( item == D[pos] ){
-        pos++;
-    }
-    temp = D[pos];
-    D[pos] = item;
-    item = temp;
+for (var cycleStart = 0; cycleStart <= N - 2; cycleStart++) {
+  item = D[cycleStart];
+  pos = cycleStart;
+  tracer._select(cycleStart);
 
-    logger._print( 'Rewrite '+D[pos]+' to index '+pos );
+  for (var i = cycleStart + 1; i <= N - 1; i++) {
+    tracer._select(i)._wait()._deselect(i);
+    if (D[i] < item) {
+      pos++;
+    }
+  }
+  if (pos == cycleStart) {
+    tracer._deselect(cycleStart);
+    continue;
+  }
+  while (item == D[pos]) {
+    pos++;
+  }
 
-    tracer._notify(pos, D[pos])._notify(cycleStart, D[cycleStart])._wait();
-    tracer._denotify(pos)._denotify(pos);
+  temp = D[pos];
+  D[pos] = item;
+  item = temp;
 
+  if (pos !== cycleStart) {
+    logger._print('Rewrite ' + D[pos] + ' to index ' + pos + '; the next value to rewrite is ' + item);
+  } else {
+    logger._print('Rewrite ' + D[pos] + ' to index ' + pos);
+  }
+  tracer._select(pos)._wait()._deselect(pos);
+  tracer._notify(pos, D[pos])._notify(cycleStart, D[cycleStart])._wait();
+  tracer._denotify(pos)._denotify(cycleStart);
 
-    while( pos != cycleStart ){
-        pos = cycleStart;
-        for( i=cycleStart+1; i<=N-1; i++ ){
-            if( D[i]<item ){
-                pos++;
-            }
-        }
+  while (pos != cycleStart) {
+    pos = cycleStart;
 
-        while( item == D[pos] ){
-            pos++;
-        }
-        temp = D[pos];
-        D[pos] = item;
-        item = temp;
+    for (i = cycleStart + 1; i <= N - 1; i++) {
+      tracer._select(i)._wait()._deselect(i);
+      if (D[i] < item) {
+        pos++;
+      }
+    }
 
-        logger._print( 'Rewrite '+D[pos]+' to index '+pos );
+    while (item == D[pos]) {
+      pos++;
+    }
 
-        tracer._notify(pos, D[pos])._notify(cycleStart, D[cycleStart])._wait();
-        tracer._denotify(pos)._denotify(pos);
+    temp = D[pos];
+    D[pos] = item;
+    item = temp;
 
-        writes++;
+    if (pos !== cycleStart) {
+      logger._print('Rewrite ' + D[pos] + ' to index ' + pos + '; the next value to rewrite is ' + item);
+    } else {
+      logger._print('Rewrite ' + D[pos] + ' to index ' + pos);
     }
+    tracer._select(pos)._wait()._deselect(pos);
+    tracer._notify(pos, D[pos])._notify(cycleStart, D[cycleStart])._wait();
+    tracer._denotify(pos)._denotify(cycleStart);
 
     writes++;
+  }
+
+  writes++;
 }
 
-logger._print( 'Number of writes performed is ' + writes );
+logger._print('Number of writes performed is ' + writes);