With datepicker working