Added client side ping pong