Added time checking