added weather support