Synced with new networking code with Eric