Moved PingManager code & fixes