Added time check