added solar check