Update: simplify client