diff --git a/scripts/grade b/scripts/grade
index 3b22ef0..5b674b3 100755
--- a/scripts/grade
+++ b/scripts/grade
@@ -16,17 +16,13 @@ for ($i=0; $i<=$#ARGV; $i++) {
 }
 
 print "Tests\n";
-$grade1 = grade("Large 5Mb/s, 10 ms, 10% drop", 5, 10, 10, "large", 1);
-$grade2 = grade("Large 10Mb/s, 50 ms, 10% drop", 10, 50, 10, "large", 0);
-$grade3 = grade("Large 10Mb/s, 50 ms, 50% drop", 10, 50, 50, "large", 0);
-$grade4 = grade("Large 3Mb/s, 10 ms, 20% drop", 3, 10, 20, "large", 0);
-$grade5 = grade("Large 50Mb/s, 5 ms, 5% drop", 50, 5, 5, "large", 0);
-$grade6 = grade("Huge 5Mb/s, 10 ms", 5, 10, 0, "huge", 0);
-$grade7 = grade("Huge 5Mb/s, 10 ms, 10% drop", 5, 10, 10, "huge", 0);
-$grade8 = grade("Huge 10Mb/s, 3 ms, 5% drop", 10, 3, 5, "huge", 0);
+$grade1 = grade("Large 5Mb/s, 10 ms, 10% drop", 5, 10, 10, 0, 0, "large", 1);
+$grade2 = grade("Large 10Mb/s, 50 ms, 10% drop", 10, 50, 10, 0, 0, "large", 0);
+$grade3 = grade("Large 10Mb/s, 25 ms, 10% drop 10% duplicate 20% delay", 10, 25, 10, 10, 20, "large", 0);
+$grade4 = grade("Huge 5Mb/s, 10 ms", 5, 0, 0, 0, 0, "huge", 0);
 
-$grade_total = $grade1 + $grade2 + $grade3 + $grade4 + $grade5 + $grade6 + $grade7+ $grade8;
-$grade_avg = $grade_total/8;
+$grade_total = $grade1 + $grade2 + $grade3 + $grade4;
+$grade_avg = $grade_total/4;
 print("   grade_total: $grade_total\n");
 print("   grade_avg: $grade_avg%\n");
 
@@ -39,8 +35,8 @@ if ($RUN_COUNT > 1) {
 }
 
 sub grade {
-  my ($problem, $bandwidth, $latency, $drop, $size) = @_;
-  my $netsim = "--bandwidth $bandwidth --drop $drop --latency $latency";
+  my ($problem, $bandwidth, $latency, $drop, $duplicate, $delay, $size) = @_;
+  my $netsim = "--bandwidth $bandwidth --drop $drop --latency $latency --duplicate $duplicate --delay $delay";
   `./netsim $netsim`;
   my $args = "--size $size";
   for ($i=0; $i<$RUN_COUNT; $i++) {
@@ -96,4 +92,4 @@ sub grade {
     print("    p_grade: $p_grade%\n");
     return($test_grade);
   }
-}
\ No newline at end of file
+}
diff --git a/scripts/grade2 b/scripts/grade2
new file mode 100755
index 0000000..3b22ef0
--- /dev/null
+++ b/scripts/grade2
@@ -0,0 +1,99 @@
+#!/usr/bin/perl
+use Sys::Hostname;
+use POSIX;
+
+my $RUN_COUNT = 1;
+my $test_count = 0;
+my $p_total = 0;
+my $t_total = 0;
+my $p_avg = -1;
+my $t_avg = -1;
+
+for ($i=0; $i<=$#ARGV; $i++) {
+  if ($ARGV[$i] eq "--run") {
+    $RUN_COUNT = $ARGV[$i + 1];
+  }
+}
+
+print "Tests\n";
+$grade1 = grade("Large 5Mb/s, 10 ms, 10% drop", 5, 10, 10, "large", 1);
+$grade2 = grade("Large 10Mb/s, 50 ms, 10% drop", 10, 50, 10, "large", 0);
+$grade3 = grade("Large 10Mb/s, 50 ms, 50% drop", 10, 50, 50, "large", 0);
+$grade4 = grade("Large 3Mb/s, 10 ms, 20% drop", 3, 10, 20, "large", 0);
+$grade5 = grade("Large 50Mb/s, 5 ms, 5% drop", 50, 5, 5, "large", 0);
+$grade6 = grade("Huge 5Mb/s, 10 ms", 5, 10, 0, "huge", 0);
+$grade7 = grade("Huge 5Mb/s, 10 ms, 10% drop", 5, 10, 10, "huge", 0);
+$grade8 = grade("Huge 10Mb/s, 3 ms, 5% drop", 10, 3, 5, "huge", 0);
+
+$grade_total = $grade1 + $grade2 + $grade3 + $grade4 + $grade5 + $grade6 + $grade7+ $grade8;
+$grade_avg = $grade_total/8;
+print("   grade_total: $grade_total\n");
+print("   grade_avg: $grade_avg%\n");
+
+if ($RUN_COUNT > 1) {
+  $t_avg = $t_total / $test_count;
+  $p_avg = $p_total / $test_count;
+  print("\n--- Average scores ---\n");
+  print("Max transfer time: $t_avg T_min\n");
+  print("Max packets: $p_avg P_min\n");
+}
+
+sub grade {
+  my ($problem, $bandwidth, $latency, $drop, $size) = @_;
+  my $netsim = "--bandwidth $bandwidth --drop $drop --latency $latency";
+  `./netsim $netsim`;
+  my $args = "--size $size";
+  for ($i=0; $i<$RUN_COUNT; $i++) {
+    print("  $problem\n");
+    my $output = `./run $args`;
+    $test_count++;
+
+    if ($output !~ m|Data match: Yes|) {
+      die("Test failed, aborting grade. Please use the run or test scripts for debugging.");
+    }
+
+    my $total_data = -1;
+    if ($size eq "huge") {
+      $total_data = 1000000;
+    } elsif ($size eq "large") {
+      $total_data = 100000;
+    }
+
+    if ($total_data == -1) {
+      die("Error: Unknown size");
+    }
+
+    my $p_th = ceil($total_data/1500);
+    my $p_min = 2 * $p_th * (1 + ($drop / 100));
+    my $t_min = $p_th * (1 + ($drop / 100)) * (($latency / 1000) + (1500 / ($bandwidth * 125000)));
+
+    if ($output =~ m|Time elapsed: ([0-9\.]*)|) {
+      $time = $1/1000;
+    } else {
+      die("Error: Could not find time elapsed");
+    }
+
+    if ($output =~ m|Packets sent: ([0-9\.]*)|) {
+      $packets = $1;
+    } else {
+      die("Error: Could not find packets sent");
+    }
+
+    my $p_score = int($packets)/$p_min;
+    my $t_score = $time/$t_min;
+    print("    seconds elapsed: $time, packets sent: $packets\n");
+    print("    t_min: $t_min, p_min: $p_min\n");
+    print("    Max transfer time: $t_score T_min\n");
+    print("    Max packets: $p_score P_min\n");
+
+    $p_total = $p_score + $p_total;
+    $t_total = $t_score + $t_total;
+
+    $t_grade = $t_score < .5 ? 141 : $t_score < .55 ? 100 : $t_score < .7 ? 80 : $t_score < .85 ? 60 : $t_score < 1 ? 40 : $t_score < 2 ? 20 : 0;
+    $p_grade = $p_score < 1.3 ? 141 : $p_score < 1.4 ? 100 : $p_score < 1.5 ? 80 : $p_score < 1.65 ? 60 : $p_score < 1.8 ? 40 : $p_score < 2 ? 20 : 0;
+    $test_grade = ($t_grade+$p_grade)/2;
+    print("    t_grade: $t_grade%\n");
+    print("    p_grade: $p_grade%\n");
+    return($test_grade);
+  }
+}
\ No newline at end of file