I realized I had overlooked an important constraint in the layout, which is that the enclosure will have two supports that occupy some region of the table - these are denoted in blue in v3 of the layout (Attachment #1). I measured the dimensions for these from the existing Y-endtable. The main subsystem this has affected is the IR transmission monitors, but I've been able to move the photodiodes a little to accommodate this constraint.

I've also done the mode-matching calculations explicitly for the proposed new layout (Attachments #2 and #3, code in Attachment #4). While the layout was largely adopted from what Andres posted in this elog, I found that some of the parameters he used in his a la mode code were probably incorrect (e.g. distance between the 750mm lens and the ETM). More critically, I think the Gouy phase for the optimized solution in the same elog is more like 60 degrees. I found that I could get a (calculated) Gouy phase difference between the two PZT mirrors of ~81 degrees by changing the green path slightly, and making the two PZT mirrors Y7 and Y8 (instead of Y7 and Y11, for which the Gouy phase difference is more like 50 degrees). But this way the two steering mirrors are much closer to each other than they were before. Other misc. remarks about the mode matching calculations:

• The beam diameter at the locations where the Faraday isolators should go is well below 5mm, the aperture size of the Faraday isolators
• The calculated mode-matching efficiencies suggest that we don't need any cylindrical lenses though the mode from the NPRO is elliptical
• Attachment #5 is a CAD drawing of the layout with all dimensions used for the mode-matching calculations included (although they are in inches)

These changes also necessitated minor changes to the transmitted IR beampath and the Oplev system, but these changes are minor. I've also switched the positions of the AUX IR power monitoring PD and the fiber coupler as suggested by Koji. The shutter has also been included.