Updated weather model to suit new weather.py