ready to be deployed after adding datepicker