Client control (22/41)

Client control