Yes, would be my guess. I am now working on the cockpit enclosure. I also found out that the astrodome assy that was retrofitted to early F models is different from production versions but not by much. A friend of mine is rebuilding a 17 called lucky13 from the 384th that has the mod. Oh and yes we are insane.