More work on calendar