Changed how the whole client-server conn works