Updated weather logic