Added more time verification