removed time check