pingpong improvements