add timestamp and timeout