date regex changed
time regex added