added proper date ieration