diff --git a/sa_core.c b/sa_core.c
index 104e01c..6cdd2e6 100644
--- a/sa_core.c
+++ b/sa_core.c
@@ -3646,8 +3646,9 @@ int validate_atten(int i) {
   test_fail_cause[i] = "Attenuator ";
 //  for (int j= 0; j < 64; j++ ) {
   for (int j= 0; j < 7; j++ ) {
-    //    set_attenuation(((float)j)/2.0);
-    set_attenuation(atten_step[j]);
+//    float a = ((float)j)/2.0;
+    float a = atten_step[j];
+    set_attenuation(a);
     float summed_peak_level = 0;
 #define ATTEN_TEST_SWEEPS    5
     for (int k=0; k<ATTEN_TEST_SWEEPS; k++) {
@@ -3655,9 +3656,9 @@ int validate_atten(int i) {
       test_acquire(TEST_ATTEN);                        // Acquire test
       //      test_validate(TEST_ATTEN);                       // Validate test
       float peaklevel = 0.0;
-      for (int n = 0 ; n < sweep_points; n++)
+      for (int n = 50 ; n < sweep_points; n++)
         peaklevel += actual_t[n];
-      peaklevel /= sweep_points;
+      peaklevel /= (sweep_points - 50);
       summed_peak_level += peaklevel;
     }
     summed_peak_level /= ATTEN_TEST_SWEEPS;
@@ -3665,8 +3666,8 @@ int validate_atten(int i) {
       reference_peak_level = summed_peak_level;
     else {
       //      shell_printf("Attenuation %.2fdB, measured level %.2fdBm, delta %.2fdB\n\r",((float)j)/2.0, summed_peak_level, summed_peak_level - reference_peak_level);
-      //   shell_printf("Attenuation %.2fdB, measured level %.2fdBm, delta %.2fdB\n\r",atten_step[j], summed_peak_level, summed_peak_level - reference_peak_level);
-#define ATTEN_TEST_CRITERIA 0.5
+      if (SDU1.config->usbp->state == USB_ACTIVE)  shell_printf("Attenuation %.2fdB, measured level %.2fdBm, delta %.2fdB\n\r",a, summed_peak_level, summed_peak_level - reference_peak_level);
+#define ATTEN_TEST_CRITERIA 1
       if (summed_peak_level - reference_peak_level <= -ATTEN_TEST_CRITERIA || summed_peak_level - reference_peak_level >= ATTEN_TEST_CRITERIA) {
         status = TS_FAIL;
  //       draw_all(true);