renamed and fixed solar_model