Made client work with server