Modified JointCalendar class and methods