Improve verify procedure with time checking