JC: added datepicker