fixing merge conflict with Danny, retained Danny's datepicker