modified calendar and annotation module