add timestamp check