diff --git a/src/ecwam/outblock.F90 b/src/ecwam/outblock.F90
index f6012624..9843f522 100644
--- a/src/ecwam/outblock.F90
+++ b/src/ecwam/outblock.F90
@@ -552,26 +552,22 @@ SUBROUTINE OUTBLOCK (KIJS, KIJL, MIJ,                 &
       ENDIF
 
 !!    alternative ways to determine wave height extremes 
-!      IF (IPFGTBL(64 + 3*NTRAIN + NTEWH) /= 0 .OR. IPFGTBL(65 + 3*NTRAIN + NTEWH) /= 0  .OR. &
-!&         IPFGTBL(66 + 3*NTRAIN + NTEWH) /= 0 .OR. IPFGTBL(67 + 3*NTRAIN + NTEWH) /= 0 ) THEN
-      IF (IPFGTBL(66 + 3*NTRAIN + NTEWH) /= 0) THEN
+      IF (IPFGTBL(63 + 3*NTRAIN + NTEWH) /= 0 .OR. IPFGTBL(64 + 3*NTRAIN + NTEWH) /= 0  .OR. &
+&         IPFGTBL(65 + 3*NTRAIN + NTEWH) /= 0 .OR. IPFGTBL(66 + 3*NTRAIN + NTEWH) /= 0 ) THEN
         CALL W_MAXH (KIJS, KIJL, FL1, DEPTH, WAVNUM,            &
      &               CMAX_F, HMAX_N, CMAX_ST, HMAX_ST, PHIST)
       ENDIF 
 
       IF (IPFGTBL(63 + 3*NTRAIN + NTEWH) /= 0) THEN
-        ! BOUT(KIJS:KIJL,ITOBOUT(IR))=CMAX_F(KIJS:KIJL)
-        CALL IBRMEMOUT (KIJS, KIJL, IBRMEM, CICOVER, BOUT(:,ITOBOUT(63 + 3*NTRAIN + NTEWH)))
+        BOUT(KIJS:KIJL,ITOBOUT(63 + 3*NTRAIN + NTEWH))=CMAX_F(KIJS:KIJL)
       ENDIF
 
       IF (IPFGTBL(64 + 3*NTRAIN + NTEWH) /= 0) THEN
-        ! BOUT(KIJS:KIJL,ITOBOUT(65 + 3*NTRAIN + NTEWH))=HMAX_N(KIJS:KIJL)
-        BOUT(KIJS:KIJL,ITOBOUT(64 + 3*NTRAIN + NTEWH))=MAX(-TAUICX(KIJS:KIJL),0.0_JWRB)
+        BOUT(KIJS:KIJL,ITOBOUT(64 + 3*NTRAIN + NTEWH))=HMAX_N(KIJS:KIJL)
       ENDIF
 
       IF (IPFGTBL(65 + 3*NTRAIN + NTEWH) /= 0) THEN
-        ! BOUT(KIJS:KIJL,ITOBOUT(66 + 3*NTRAIN + NTEWH))=CMAX_ST(KIJS:KIJL)
-        BOUT(KIJS:KIJL,ITOBOUT(65 + 3*NTRAIN + NTEWH))=MAX(-TAUICY(KIJS:KIJL),0.0_JWRB)
+        BOUT(KIJS:KIJL,ITOBOUT(65 + 3*NTRAIN + NTEWH))=CMAX_ST(KIJS:KIJL)
       ENDIF
 
       IF (IPFGTBL(66 + 3*NTRAIN + NTEWH) /= 0) THEN
@@ -593,15 +589,15 @@ SUBROUTINE OUTBLOCK (KIJS, KIJL, MIJ,                 &
       ENDIF
 
       IF (IPFGTBL(69 + 3*NTRAIN + NTEWH) /= 0) THEN
-        BOUT(KIJS:KIJL,ITOBOUT(69 + 3*NTRAIN + NTEWH))=0._JWRB
+        CALL IBRMEMOUT (KIJS, KIJL, IBRMEM, CICOVER, BOUT(:,ITOBOUT(69 + 3*NTRAIN + NTEWH)))
       ENDIF
 
       IF (IPFGTBL(70 + 3*NTRAIN + NTEWH) /= 0) THEN
-        BOUT(KIJS:KIJL,ITOBOUT(70 + 3*NTRAIN + NTEWH))=0._JWRB
+        BOUT(KIJS:KIJL,ITOBOUT(70 + 3*NTRAIN + NTEWH))=TAUICX(KIJS:KIJL)
       ENDIF
 
       IF (IPFGTBL(71 + 3*NTRAIN + NTEWH) /= 0) THEN
-        BOUT(KIJS:KIJL,ITOBOUT(71 + 3*NTRAIN + NTEWH))=0._JWRB
+        BOUT(KIJS:KIJL,ITOBOUT(71 + 3*NTRAIN + NTEWH))=TAUICY(KIJS:KIJL)
       ENDIF