YES! Date is working
code fix up