Added collector and heater to model. Simulation takes ages.