Added Date logic