switch to from date to calendar to support timezones