final version of server and new client