changed calendar integration
merge