Changed Ping/Pong logic