UPGRADE. Datepicker added