added first conditional for weather