New version with client-server