Added date field back in