Updated with DatePickerExample