ServerClient class edited