Added support for weather and fixed fringe cases