Changes:
- Reimplemented some changes for calendar1 usinga  working Calendar module.