Updated so that the date selection will call the delegate first.