date conversion working
adding changes