Updated ping_pong, rest stay unchanged