added date conversion