Added weather checking