cont. with forecast service
fixed merge conflicts