Ping and Pong fixed