DatePicker, some changes