Added conditional for date.