diff --git a/Python_Code/onlinemodel/layout/layout.py b/Python_Code/onlinemodel/layout/layout.py
index ea68f47..a8b975e 100644
--- a/Python_Code/onlinemodel/layout/layout.py
+++ b/Python_Code/onlinemodel/layout/layout.py
@@ -319,10 +319,13 @@ import math
 # 3) Add space between septum and the quadrupoles for matching into Linac 2
 # 4) Replaced X-band cavities in SATSY with C-band cavities
 
+# Layout 11.0.4
+# 1) Adding 5th and 6th RF structure to SINCB01 to gain more energy.
+
 class SwissFEL:
     def __init__(self,alt=0):
         self.alt=alt
-        self.Version='11.0.3'
+        self.Version='11.0.4'
 
     def Types(self,TM):
 # type definitions for the SwissFEL lattice        
@@ -792,6 +795,7 @@ class SwissFEL:
         # C-banLinac
   
         a0={'Length': 9.8}
+        a0a = {'Length': 9.8+4.41}
         a1={'Element':'TW Cav C-Band','sRef':0.035,'Ref':'relative','index':100}
         a2={'Element':'TW Cav C-Band','sRef':0.049387,'Ref':'relative','index':200}
         a3={'Element':'DBPM-C16','sRef':0.080613,'Ref':'relative','index':220}
@@ -801,8 +805,12 @@ class SwissFEL:
         a7={'Element':'DBPM-C16','sRef':0.099538,'Ref':'relative','index':420}
         a8={'Element':'QFDM','sRef':0.049,'Ref':'relative','index':430}
         a9={'Element':'DWSC-C16','sRef':0.019,'Ref':'relative','index':440}
+        a10 = {'Element': 'TW Cav C-Band', 'sRef': 0.252075, 'Ref': 'relative', 'index': 500}
+        a11 = {'Element': 'TW Cav C-Band', 'sRef': 0.049387, 'Ref': 'relative', 'index': 600}
         seq=[a0,a1,a2,a3,a4,a5,a6,a7,a8]
         TM.define('CB-Lin1-Cell',seq)
+        seq = [a0a, a1, a2, a3, a4, a5, a6, a7, a8,a10,a11]
+        TM.define('CB-Lin1-Cell-6RF', seq)
         seq=[a0,a1,a2,a3,a4,a5,a6,a7,a8,a9]
         TM.define('CB-Lin1-Cell-WSC',seq)
         a0alt={'Length': 9.135}
@@ -1107,18 +1115,20 @@ class SwissFEL:
             
         # padding for moving the
         if self.alt >1:
-                MA01=LineContainer('MA01',4.8)
+                MA01=LineContainer('MA01',4.8-0.2667)
                 MA01.append(TM.generate('DBPM-C16', 10), 0.2, 'relative')
                 MA01.append(TM.generate('QFDM', 20), 0.2, 'relative')
-                MA01.append(TM.generate('QFDM-noCor', 30), 1.5, 'relative')
-                MA01.append(TM.generate('DBPM-C16', 40), 1.2, 'relative')
+                MA01.append(TM.generate('QFDM-noCor', 30), 1.5-0.13, 'relative')
+                MA01.append(TM.generate('DBPM-C16', 40), 1.2-0.1367, 'relative')
                 MA01.append(TM.generate('QFDM', 50), 0.2, 'relative')
-                CB01 = TM.generate('CB-Lin1-Cell', 0, {'Name': 'CB01'})
-        dL = 0
-        if self.alt == 2:
-            dL = 3.6+0.2833
-        DI01 = LineContainer('DI01', 3.84+dL)
-        DI01.append(TM.generate('DBPM-C16', 10), 0.263+dL, 'relative')
+                CB01 = TM.generate('CB-Lin1-Cell-6RF', 0, {'Name': 'CB01'})
+        if self.alt==2:
+            dL = 0.26
+            DI01 = LineContainer('DI01', 3.84-dL+0.1733)
+            DI01.append(TM.generate('DBPM-C16', 10), 0.263-dL+0.1733, 'relative')
+        else:
+            DI01 = LineContainer('DI01', 3.84)
+            DI01.append(TM.generate('DBPM-C16', 10), 0.263, 'relative')
         DI01.append(TM.generate('QFDM',20),0.037,'relative')
         DI01.append(TM.generate('QFBS',30),0.27,'relative')
         DI01.append(TM.generate('DBPM-C16',60),0.109+0.012+0.4+0.137,'relative')