added datePicker, ready to mimic the sample code