added snow todo: add rain
resolved conflicts