Worked on calendar implementation