cont. with calendar service
fixed merge conflicts