adding id
cleanup calendar api
all combined - does not works :(