added date parsing