Tweaked code because of change to enum for weather.