Got the time fields to work