Modifications to SolarCalculator