diff --git a/plugins/evaluations/eval_calc_scores.php b/plugins/evaluations/eval_calc_scores.php
index c6845041..188dc327 100644
--- a/plugins/evaluations/eval_calc_scores.php
+++ b/plugins/evaluations/eval_calc_scores.php
@@ -31,9 +31,9 @@
 include "sfiab_common.inc.php";   // check SFIAB install and get config etc.
 include "eval_common.inc.php";    // check Evaluations setup and get eval_config
 include "eval_menu_inc.php";
-echo "<br />Note: For now, this just calculates scores for every project in table 'judges_teams_timeslots_projects_link'<br />";
-echo " and lists just the project number for each and then lists the details for the last project in the list.<br /><br /> ";
-echo " and storese the results into table eval_projects and 'judges_teams_timeslots_projects_link' score field<br /><br >";
+echo "<br />Note: For now, this updates the score field in  'judges_teams_timeslots_projects_link' for every team/project with a complete evaluation entry<br />";
+echo " and updates the eval_score and eval_score_status fields in table eval_projects for every project for which a score can be calculated.<br />";
+echo "For test purposes it lists just the project number for each project, then lists the scores details for the last project in the list.<br /><br /> ";
 // do all projects  
 $q = mysql_query("SELECT DISTINCT projects_id from judges_teams_timeslots_projects_link");
 while($r=mysql_fetch_object($q)) {
@@ -50,7 +50,9 @@ while($r=mysql_fetch_object($q)) {
 	if (is_null($score)) {$score = "NULL";}
 	 $up = mysql_query("UPDATE judges_teams_timeslots_projects_link SET score = ".$score.
 	       " WHERE judges_teams_id = '".$team_id."' AND projects_id = '".$r->projects_id."' ");
- }
+  }
+  // update eval_judges table
+  $up = mysql_query("UPDATE eval_projects SET eval_score = '".$ret_array[eval_score]."',  eval_score_status = '".$ret_array[eval_score_status]."' WHERE project_id = '".$r->projects_id."' ");
   }
 }
 echo "<br /><br />";
diff --git a/plugins/evaluations/eval_common.inc.php b/plugins/evaluations/eval_common.inc.php
index 5db31c5f..18c11679 100644
--- a/plugins/evaluations/eval_common.inc.php
+++ b/plugins/evaluations/eval_common.inc.php
@@ -262,6 +262,7 @@ function calc_scores($project_id)
 		$list_array[$team] = array(team_id=>$arr[$team][0][0],team_num=>$arr[$team][0][5],proj_num=>$arr[$team][0][6],team_score=>$team_score,team_status=>$err_codes);
 	}  //                                                                                                   ******    Loop thr Judge Teams   ******************************
 	//  This gets the project score based on the average of the sum of the criteria averages  (Dennis Spanogle method)
+	$num_bad_crits = 0;
 	for ($cc = 0;$cc<$num_criterias;$cc++) {
 		$judcritttl = 0;
 		$avg_cnt = 0;
@@ -271,7 +272,8 @@ function calc_scores($project_id)
 			$level_value =$arr[$jj][$cc][2];
 			$spec_use = $arr[$jj][$cc][3];
 			$spec_use_code = $arr[$jj][$cc][4];
-			if($spec_use == "no"){
+			// add in the good judge entries for this criteria
+			if($spec_use == "no" && $level_value != -1){
 				$judcritttl += $level_value * $weight;
 				$avg_cnt++;
 			}
@@ -288,12 +290,15 @@ function calc_scores($project_id)
 				}	
 			}
 		}
-		// have values for this criteria, get average
+		// Get the average for this criteria
 		if ($avg_cnt >0){
 			$crit_avg_wtd = $judcritttl/$avg_cnt;
 		}
-		else{
+		else{    // This criteria had no entries so the total score can not be calculated unless weight = 0 then don't care
 			$crit_avg_wtd = 0;
+			if ($weight > 0){
+			   $num_bad_crits ++;
+			}
 		}
 		$rst[$cc] = array($crit_avg_wtd,$err_codes);
 	}
@@ -310,7 +315,12 @@ function calc_scores($project_id)
 			}
 		}
 	}
-	$score = $ttl/$max_level_val;
+	if ($num_bad_crits == 0){      // if any criteria had no entries then cannot use the score
+		$score = $ttl/$max_level_val;
+	}
+	else {
+	    $score = 0;
+	}
 	//echo "Project number ".$project_num." (id ".$project_id.")    Score=".$score."    code: ".$ttlcode."<br />";
 	//for ($i=0;$i < $num_judges_teams; $i++){
 	//		echo "id ".$list_array[$i][team_id]."   score ".$list_array[$i][team_score]."<br />";