Move weather check to make it less awkward