small improvment with calendar