diff --git a/model/src/w3iogomd.F90 b/model/src/w3iogomd.F90
index de660ded4..d93f6c43c 100644
--- a/model/src/w3iogomd.F90
+++ b/model/src/w3iogomd.F90
@@ -842,6 +842,11 @@ SUBROUTINE W3FLDTOIJ(FLD, I, J, IAPROC, NAPOUT, NDSEN)
     CASE('IC5')
       I = 1
       J = 12
+#endif
+#ifdef W3_SETUP
+    CASE('ZET')
+      I = 1
+      J = 13
 #endif
       ! Group 2
       !
diff --git a/model/src/w3ounfmetamd.F90 b/model/src/w3ounfmetamd.F90
index 87e606e56..7bdca32d0 100644
--- a/model/src/w3ounfmetamd.F90
+++ b/model/src/w3ounfmetamd.F90
@@ -2745,6 +2745,19 @@ SUBROUTINE DEFAULT_META()
     META(1)%VMIN = 0
     META(1)%VMAX = 1500
 #endif
+#ifdef W3_SETUP
+    META => GROUP(1)%FIELD(13)%META
+    META(1)%FSC    = 1.
+    META(1)%UNITS  = 'm'
+    META(1)%ENAME  = '.zet'
+    META(1)%VARNM='ZET'
+    META(1)%VARNL='wave_setup'
+    !META(1)%VARNS='sediment_grain_size'
+    META(1)%VARNS=''
+    META(1)%VARNG='wave_setup'
+    META(1)%VMIN = -100.
+    META(1)%VMAX = 100.
+#endif 
     !
     !----------GROUP 2 ----------------
     !
diff --git a/model/src/w3updtmd.F90 b/model/src/w3updtmd.F90
index 4e517d50a..c5926ddf6 100644
--- a/model/src/w3updtmd.F90
+++ b/model/src/w3updtmd.F90
@@ -2265,6 +2265,7 @@ SUBROUTINE W3ULEV ( A, VA )
 
 #ifdef W3_SETUP
        IF (DO_CHANGE_WLV) THEN
+         !write(*,*) 'CHECK WAVE SETUP', WLV(ISEA), ZETA_SETUP(ISEA), DW(ISEA), ZB(ISEA) 
          WLVeff    = WLVeff + ZETA_SETUP(ISEA)
          WLV(ISEA) = WLVeff
        END IF
diff --git a/model/src/ww3_ounf.F90 b/model/src/ww3_ounf.F90
index a2ff83e26..a3aa2f631 100644
--- a/model/src/ww3_ounf.F90
+++ b/model/src/ww3_ounf.F90
@@ -946,6 +946,7 @@ SUBROUTINE W3EXNC ( NX, NY, IX1, IXN, IY1, IYN, NSEA,             &
 #ifdef W3_RTD
     USE W3SERVMD, ONLY : W3THRTN, W3XYRTN, W3EQTOLL
 #endif
+    USE W3WDATMD, ONLY : ZETA_SETUP
     USE W3ARRYMD, ONLY : OUTA2I, PRTBLK
     USE W3GDATMD, ONLY : SIG, GTYPE, FLAGLL, MAPSTA, MAPST2
     USE W3GDATMD, ONLY : NK, UNGTYPE, MAPSF, NTRI, CLGTYPE, RLGTYPE, &
@@ -957,6 +958,7 @@ SUBROUTINE W3EXNC ( NX, NY, IX1, IXN, IY1, IYN, NSEA,             &
 #ifdef W3_T
     USE W3ODATMD, ONLY : NDST
 #endif
+
     USE NETCDF
     IMPLICIT NONE
 
@@ -1304,6 +1306,12 @@ SUBROUTINE W3EXNC ( NX, NY, IX1, IXN, IY1, IYN, NSEA,             &
             NFIELD=1
 #endif
 
+#ifdef W3_SETUP
+            ! Wave Setup
+          ELSE IF (IFI .EQ. 1 .AND. IFJ .EQ. 13 ) THEN
+            CALL S2GRID(ZETA_SETUP(1:NSEA), X1)
+            NFIELD=1
+#endif 
             ! Significant wave height
           ELSE IF ( IFI .EQ. 2 .AND. IFJ .EQ. 1 ) THEN
             IF (NCVARTYPEI.EQ.3) NCVARTYPE=2