Index: ezsteps.scm
==================================================================
--- ezsteps.scm
+++ ezsteps.scm
@@ -171,20 +171,21 @@
 			      ((and (eq? process-exit-status 4) logpro-used) 'waived) ;; logpro 4 = waived
 			      ((and (eq? process-exit-status 5) logpro-used) 'abort)  ;; logpro 5 = abort
 			      ((and (eq? process-exit-status 6) logpro-used) 'skip)   ;; logpro 6 = skip
 			      ((eq? process-exit-status 0)                   'pass)   ;; logpro 0 = pass
 			      (else 'fail)))
-	   (overall-status   (cond
+	   (overall-status   
+                             (cond
 			      ((eq? (launch:einf-rollup-status exit-info) 2) 'warn) ;; rollup-status (vector-ref exit-info 3)
-			      ((eq? (launch:einf-rollup-status exit-info) 0) 'pass) ;; (vector-ref exit-info 3)
-			      (else 'fail)))
-	   (next-status      (cond 
-			      ((eq? overall-status 'pass) this-step-status)
-			      ((eq? overall-status 'warn)
-			       (if (eq? this-step-status 'fail) 'fail 'warn))
-			      ((eq? overall-status 'abort) 'abort)
-			      (else 'fail)))
+			      ((eq? (launch:einf-rollup-status exit-info) 3) 'check) 
+			      ((eq? (launch:einf-rollup-status exit-info) 4) 'waived)
+			      ((eq? (launch:einf-rollup-status exit-info) 5) 'abort)
+			      ((eq? (launch:einf-rollup-status exit-info) 6) 'skip)
+			      ((eq? (launch:einf-rollup-status exit-info) 0) 'pass) 
+			      (else 'fail)))
+	   (next-status      (common:worse-status-sym this-step-status overall-status))
+
 	   (next-state       ;; "RUNNING") ;; WHY WAS THIS CHANGED TO NOT USE (null? tal) ??
 	    (cond
 	     ((null? tal) ;; more to run?
 	      "COMPLETED")
 	     (else "RUNNING"))))

Index: launch.scm
==================================================================
--- launch.scm
+++ launch.scm
@@ -53,11 +53,11 @@
 
 ;; given an exit code and whether or not logpro was used calculate OK/BAD
 ;; return #t if we are ok, #f otherwise
 (define (steprun-good? logpro exitcode stepparms)
   (or (eq? exitcode 0)
-      (and logpro (eq? exitcode 2)) ;; shouldn't this be (member exitcode 2 ...) with the other ok codes?
+      (and logpro  (member exitcode '( 2 4 6)))
       (let* ((params (alist-ref 'params stepparms)) ;; get the params section
 	     (keep-going (if params
 			     (alist-ref "keep-going" params equal?)
 			     #f)))
 	(debug:print 0 *default-log-port* "keep-going=" keep-going)