add ping pong support