Updated with correct version of server and client