SolarFan/Envelope changed based on user testing