Finished Server-Client version