diff --git a/examples/LLO_matched.kat b/examples/LLO_matched.kat
index 7d54c8beadb4e1e025c317ff2fff6390afd30f26..397f102fe765bc0e4aea1dff6433d701067d9aaa 100644
--- a/examples/LLO_matched.kat
+++ b/examples/LLO_matched.kat
@@ -26,46 +26,45 @@
 %--------------------------------------------------------------------------
 
 
-# %%% FTblock Laser
-# ###########################################################################
-# # Laser
-# l L0 2 0 n0
-# s lmod1 1 n0 n1
-# # Modulation indices updated from LLO logbook denis.martynov@LIGO.ORG - 02:01,
-# # Thursday 03 October 2013 (8940)
-# mod mod1 $f1 0.25 1 pm n1 n2
-# s lmod2 1 n2 n3
-# mod mod2 $f2 0.25 1 pm n3 nin
-# # Input beam mode-matched to case with 50km lens in itm substrates (matched
-# # to arm cavities) for LLO design case
-# gauss gparam L0 n0 1.3498243m 4.3433202 1.3619432m 4.5706208
-# ###########################################################################
-# %%% FTend Laser
-
-# %%% FTblock PR
-# ###########################################################################
-# # Distance to power recycling mirror
-# s lin 1 nin nREFL
-# # Power recycling mirror PRM-02
-# m1 PRM $T_PRM $L_PRM $phi_PRM nREFL nPRMb
-# attr PRM Rc 11.009
-# # Distance between PRM and PR2
-# s lp1 16.6107 nPRMb nPR2a
-# # PR2 PR2-02
-# bs1 PR2 $T_PR2 $L_PR2 0 -0.79 nPR2a nPR2b dump nPOP
-# attr PR2 Rc -4.545
-# # Distance from PR2 to PR3
-# s lp2 16.1647 nPR2b nPR3a
-# # PR3 PR3-03
-# bs1 PR3 $T_PR3 $L_PR3 0 0.615 nPR3a nPR3b dump dump
-# attr PR3 Rc 36.027
-# # Distance from PR3 to BS
-# s lp3 19.5381 nPR3b nHRBS_PR
-# ###########################################################################
-# %%% FTend PR
-
+%%% FTblock Laser
+###########################################################################
+# Laser
 l L0 2 0 n0
-s s1 100 n0 nHRBS_PR
+s lmod1 1 n0 n1
+# Modulation indices updated from LLO logbook denis.martynov@LIGO.ORG - 02:01,
+# Thursday 03 October 2013 (8940)
+mod mod1 $f1 0.25 1 pm n1 n2
+s lmod2 1 n2 n3
+mod mod2 $f2 0.25 1 pm n3 nin
+# Input beam mode-matched to case with 50km lens in itm substrates (matched
+# to arm cavities) for LLO design case
+gauss gparam L0 n0 1.3498243m 4.3433202 1.3619432m 4.5706208
+###########################################################################
+%%% FTend Laser
+
+%%% FTblock PR
+###########################################################################
+# Distance to power recycling mirror
+s lin 1 nin nREFL	
+# Power recycling mirror PRM-02
+m1 PRM $T_PRM $L_PRM $phi_PRM nREFL nPRMb
+attr PRM Rc 11.009
+# Distance between PRM and PR2
+s lp1 16.6107 nPRMb nPR2a
+# PR2 PR2-02
+bs1 PR2 $T_PR2 $L_PR2 0 -0.79 nPR2a nPR2b dump nPOP
+attr PR2 Rc -4.545
+# Distance from PR2 to PR3
+s lp2 16.1647 nPR2b nPR3a
+# PR3 PR3-03
+bs1 PR3 $T_PR3 $L_PR3 0 0.615 nPR3a nPR3b dump dump
+attr PR3 Rc 36.027
+# Distance from PR3 to BS
+s lp3 19.5381 nPR3b nHRBS_PR
+###########################################################################
+%%% FTend PR
+
+
 %%% FTblock BS
 ###########################################################################
 # BS beamsplitter BS-02
@@ -91,40 +90,52 @@ s s1 100 n0 nHRBS_PR
 ##------------------------------------------------------------
 # BS BS-02
 bs1 HRBS 0.5 8.6u $phi_BS 45 nHRBS_PR nHRBS_Y nHRBS_X nHRBS_SR
-s sHRBStoARBSX 5 $nsilica nHRBS_X nARBSX_sub
+s sHRBStoARBSX 0.0685 $nsilica nHRBS_X nARBSX_sub
 bs2 ARBSX 30u 1.7u $phi_ARBSX 29.1951 nARBSX_sub dump nARBSX_X dump
-s sHRBStoARBSSR 5 $nsilica nHRBS_SR nARBSSR_sub
+s sHRBStoARBSSR 0.0684 $nsilica nHRBS_SR nARBSSR_sub
 bs2 ARBSSR 30u 1.7u $phi_ARBSSR -29.1951 nARBSSR_sub dump nARBSSR_SR dump
 ###########################################################################
 %%% FTend BS
 
 
-# %%% FTblock SR
-# ###########################################################################
-# # Distance from BS to SR3
-# s ls3 19.3661 nARBSSR_SR nSR3a
-#
-# # SR3 SR3-01
-# bs1 SR3 $T_SR2 $L_SR3 0 0.785 nSR3a nSR3b dump dump
-# attr SR3 Rc 35.97
-#
-# # Distance from SR3 to SR2
-# s ls2 15.4435 nSR3b nSR2a
-#
-# # SR2 SR2-04
-# bs1 SR2 $T_SR2 $L_SR2 0 0.87 nSR2a nSR2b dump dump
-# attr SR2 Rc -6.406
-#
-# # Distance from SR2 to SRMHR
-# s ls1 15.7566 nSR2b nSRMHRa
-#
-# # Signal recycling mirror SRM-08
-# m1 SRMHR $T_SRM $L_SRM $phi_SRM nSRMHRa nSRMHRb
-# s SRMsub 0.0749 $nsilica nSRMHRb nSRMARa
-# attr SRMHR Rc -5.677
-# m2 SRMAR 50u 0 $phi_SRM nSRMARa nSRMARb
-# ###########################################################################
-# %%% FTend SR
+%%% FTblock SR
+###########################################################################
+# Distance from BS to SR3
+s ls3 19.3661 nARBSSR_SR nSR3a
+
+<<<<<<< HEAD:tasks/20141203/H1_DRMI_20141023_matched.kat
+# SR3 SR3-02
+bs1 SR3 5u 19.1u 0 0.765 nSR3a nSR3b dump dump
+attr SR3 Rc 36.013
+=======
+# SR3 SR3-01
+bs1 SR3 $T_SR2 $L_SR3 0 0.785 nSR3a nSR3b dump dump
+attr SR3 Rc 35.97
+>>>>>>> 194f08ff4863645a5922cddb8c7b8e61224547f4:finesse_files/core/2014_12_5/LLO_matched.kat
+
+# Distance from SR3 to SR2
+s ls2 15.4435 nSR3b nSR2a
+
+<<<<<<< HEAD:tasks/20141203/H1_DRMI_20141023_matched.kat
+# SR2 SR2-03
+bs1 SR2 18.3u 7.2u 0 0.86 nSR2a nSR2b dump dump
+attr SR2 Rc -6.424
+=======
+# SR2 SR2-04
+bs1 SR2 $T_SR2 $L_SR2 0 0.87 nSR2a nSR2b dump dump
+attr SR2 Rc -6.406
+>>>>>>> 194f08ff4863645a5922cddb8c7b8e61224547f4:finesse_files/core/2014_12_5/LLO_matched.kat
+
+# Distance from SR2 to SRMHR
+s ls1 15.7566 nSR2b nSRMHRa
+
+# Signal recycling mirror SRM-08
+m1 SRMHR $T_SRM $L_SRM $phi_SRM nSRMHRa nSRMHRb
+s SRMsub 0.0749 $nsilica nSRMHRb nSRMARa
+attr SRMHR Rc -5.677
+m2 SRMAR 50u 0 $phi_SRM nSRMARa nSRMARb
+###########################################################################
+%%% FTend SR
 
 
 %%% FTblock Yarm
@@ -139,51 +150,105 @@ s sCPYtoITMYar 0.02 nCPYar2 nITMYTLin
 # Y arm input mirror ITM-08
 # Thermal lens
 lens ITMYTL $TL_f nITMYTLin nITMYTLtrans
-s ITMYTL_null 10 nITMYTLtrans nITMYconstL_in
+s ITMYTL_null 0 nITMYTLtrans nITMYconstL_in
 # Constant ITMY substrate lens
+%lens ITMYconstL -82.4k nITMYconstL_in nITMYconstL_trans
 lens ITMYconstL inf nITMYconstL_in nITMYconstL_trans
-# s ITMYTL_null2 0 nITMYconstL_trans nITMYar_in
-# m2 ITMYar 250u 0.6u $phi_ITMY nITMYar_in nITMYs1
-# s lITMY 0.19961 $nsilica nITMYs1 nITMYs2
-# m1 ITMY $T_ITMY $L_ITMY $phi_ITMY nITMYs2 nITMY2
-# attr ITMY Rc -1940.7
-# # Y-arm
-# s Ly 10 nITMY2 nETMY1
-# # ETMY
-# m1 ETMY $T_ETMY $L_ETMY $phi_ETMY nETMY1 nTY
-# attr ETMY Rc 2242.4
+s ITMYTL_null2 0 nITMYconstL_trans nITMYar_in
+m2 ITMYar 250u 0.6u $phi_ITMY nITMYar_in nITMYs1
+s lITMY 0.19961 $nsilica nITMYs1 nITMYs2
+m1 ITMY $T_ITMY $L_ITMY $phi_ITMY nITMYs2 nITMY2
+attr ITMY Rc -1940.7
+# Y-arm
+s Ly $L_yARM nITMY2 nETMY1
+# ETMY
+m1 ETMY $T_ETMY $L_ETMY $phi_ETMY nETMY1 nTY
+attr ETMY Rc 2242.4
 ###########################################################################
 %%% FTend Yarm
 
-# %%% FTblock Xarm
-# ###########################################################################
-# # Now using length taken from E1200616
-# s lx1 4.829 nARBSX_X nCPXar1
-# # X arm compensation plate CP-06
-# m2 CPXar1 33u 0.6u 0 nCPXar1 nCPXar1s
-# s sCPX 0.10031 $nsilica nCPXar1s nCPXar2s
-# m2 CPXar2 8u 0.6u 0 nCPXar2s nCPXar2
-# s sCPXtoITMXar 0.02 nCPXar2 nITMXTLin
-# # X arm input mirror ITM-04
-# # Thermal lens
-# lens ITMXTL $TL_f nITMXTLin nITMXTLtrans
-# s ITMXtl_null 0 nITMXTLtrans nITMXconstL_in
-# # Non-thermal ITM lens
-# lens ITMXconstL inf nITMXconstL_in nITMXconstL_trans
-# s ITMXTL_null2 0 nITMXconstL_trans nITMXar_in
-# m2 ITMXar 164u 0.5u $phi_ITMX nITMXar_in nITMXs1
-# s lITMX1 0.20027 $nsilica nITMXs1 nITMXs2
-# m1 ITMX $T_ITMX $L_ITMX $phi_ITMX nITMXs2 nITMX2
-# # default Rc from nebula page
-# attr ITMX Rc -1937.9
-# # X-arm
-# s Lx 10 nITMX2 nETMX1
-# # ETMX
-# m1 ETMX $T_ETMX $L_ETMX $phi_ETMX nETMX1 nTX
-# attr ETMX Rc 2239.7
-# ###########################################################################
-# %%% FTend Xarm
+%%% FTblock Xarm
+###########################################################################
+# Now using length taken from E1200616
+s lx1 4.829 nARBSX_X nCPXar1
+# X arm compensation plate CP-06
+m2 CPXar1 33u 0.6u 0 nCPXar1 nCPXar1s
+s sCPX 0.10031 $nsilica nCPXar1s nCPXar2s
+m2 CPXar2 8u 0.6u 0 nCPXar2s nCPXar2
+s sCPXtoITMXar 0.02 nCPXar2 nITMXTLin
+# X arm input mirror ITM-04
+# Thermal lens
+lens ITMXTL $TL_f nITMXTLin nITMXTLtrans
+s ITMXtl_null 0 nITMXTLtrans nITMXconstL_in
+# Non-thermal ITM lens
+lens ITMXconstL inf nITMXconstL_in nITMXconstL_trans
+s ITMXTL_null2 0 nITMXconstL_trans nITMXar_in
+m2 ITMXar 164u 0.5u $phi_ITMX nITMXar_in nITMXs1
+s lITMX1 0.20027 $nsilica nITMXs1 nITMXs2
+m1 ITMX $T_ITMX $L_ITMX $phi_ITMX nITMXs2 nITMX2
+# default Rc from nebula page
+attr ITMX Rc -1937.9
+# X-arm
+s Lx $L_xARM nITMX2 nETMX1
+# ETMX
+m1 ETMX $T_ETMX $L_ETMX $phi_ETMX nETMX1 nTX
+attr ETMX Rc 2239.7
+###########################################################################
+%%% FTend Xarm
 
+%%% FTblock OMC
+###########################################################################
+# Path to OMC from SRM: OMC telescope.  Distances rom Lisa's MOC mode matching
+# alamode file (https://alog.ligo-la.caltech.edu/aLOG/index.php?callRep=8565)
+# Angles from D1000342, transmission of telescope mirrors from L1300231-v7
+# (note in L1300231-v7 some transmissions/ losses are guesses)
+# Distance from SRMAR - OM1
+s lSRM_to_OM1 3.571 nSRMARb nOM1in
+# OM1
+bs1 OM1 800u 37.5u 0 2.251 nOM1in nOM1refl dump dump
+attr OM1 Rc 4.6
+# Distance from OM1 - OM2
+s lOM1_to_OM2 1.395 nOM1refl nOM2in
+# OM2
+bs1 OM2 10u 37.5u 0 4.399 nOM2in nOM2refl dump dump
+attr OM2 Rc 1.7
+# Distance from OM2 - OM3
+s lOM2_to_OM3 0.708 nOM2refl nOM3in
+# OM3
+bs1 OM3 10u 37.5u 0 30.037 nOM3in nOM3refl dump dump
+# 0.38 = real distance to OMC waist (from OM3)
+# 0.38 = distance(OM3 - OMC) + thickness(OMC_IC) + OMC_l1/2
+# 0.38 = distance(OM3 - OMC) + 0.01078 + 0.2815/2
+# distance(OM3 - OMC) = 0.2283
+s lOM3_to_OMC 0.2283 nOM3refl nICar_in
+### OMC
+# OMC input coupler
+bs1 ICar_OM3 1 0 0 4.004 nICar_in dump nICsubin dump
+s subIC_in 0.01078 $nsilica nICsubin nICin
+# Input coupler (HR surface, flat mirror)
+bs1 IC 0.0076 10u $phi_IC 2.7609 nICin nICrefl nICtrans nICout
+s subIC_refl 0.01078 $nsilica nICrefl nICsubrefl
+bs1 ICar_refl 1 0 0 -4.004 nICsubrefl dump nICar_refl dump
+# Distance from IC - OC
+s lOMC1 0.2815 nICtrans nOCin
+# Output coupler (flat mirror)
+bs1 OC 0.0075 10u 0 -4.004 nOCin nOCrefl nOCtrans dump
+# Distance from OC - CM1
+s lOMC2 0.2842 nOCrefl nCM1in
+# CM1 (curved mirror)
+bs1 CM1 36u 10u 0 -4.004 nCM1in nCM1refl dump dump
+attr CM1 Rc 2.57321
+# Distance from CM1 - CM2
+s lOMC3 0.2815 nCM1refl nCM2in
+# CM2 (curved mirror)
+bs1 CM2 35.9u 10u 0 4.004 nCM2in nCM2refl dump dump
+attr CM2 Rc 2.57369
+# Distance from CM2 - IC
+s lOMC4 0.2842 nCM2refl nICout
+# Distance to detector output
+s sout 3.5 nOCtrans nAS
+###########################################################################
+%%% FTend OMC
 
 %%% FTblock Reflectivities
 ###########################################################################
@@ -233,6 +298,9 @@ const L_ETMY 9.3u
 %%% FTblock Constants
 ###########################################################################
 const nsilica 1.44963098985906
+const L_xARM 3994.485
+const L_yARM 3994.515
+
 % Sidebands tuned to be resonant for PRC in this file (lprc = 57.6564)
 % Design sidebands
 %const f1 9099471
diff --git a/examples/optivis_ex.py b/examples/optivis_ex.py
index e6638e006f838e12b1547df7b6568cb01cf44274..cfa7b8597e0c781739b9c208a5375123c2cde0d6 100644
--- a/examples/optivis_ex.py
+++ b/examples/optivis_ex.py
@@ -15,8 +15,8 @@ m m2 1 0 0 n7a n7b
 
 s s4 50 n5 n5a
 m m3 1 0 0 n5a n5b
-s s4a 200 n5b n8a
-m m4 1 0 0 n8a n8b
+#s s4a 200 n5b n8a
+#m m4 1 0 0 n8a n8b
 """)
 
 kat.optivis().show()
diff --git a/pykat/finesse.py b/pykat/finesse.py
index 20354e8de178d75bf476248255d271b08d561295..1ee87ec02c49ddfe3aa42f2ea65de11bcf5b6945 100644
--- a/pykat/finesse.py
+++ b/pykat/finesse.py
@@ -1470,9 +1470,6 @@ class kat(object):
             print("Adding %s" % c.name)
             optivis_op = getattr(c, "getOptivisComponent", None)
             
-            if callable(optivis_op):
-                scene.addComponent(c.getOptivisComponent())
-
         # Run through again to add links
         for c in self.getComponents():
             if not isinstance(c, pykat.components.space):
diff --git a/pykat/optics/maps.py b/pykat/optics/maps.py
index a399727f4017b130f43a1c9ac52ec8c0cb1a1f94..4ca3b17285517b0e47e30219b2401cf9860b801f 100644
--- a/pykat/optics/maps.py
+++ b/pykat/optics/maps.py
@@ -170,7 +170,7 @@ class surfacemap(object):
             
             data = D(nx-self.offset[0], ny-self.offset[0])
             
-            self.name += " [ROMHOM interpolated]"
+            self.name += "[ROMHOM_Interpolated]"
             
             self.center = (np.array(data.shape)+1)/2.0