added date check
added time check