Updated So-client