removed commenting out of solar