Client control (24/41)

Client control