latest changes for Calendar control