followup to Calendar overhaul