staphany changes to calendar-tools