Weather_spec refactored