Added solarEnvelope_2, solarFan_2 components