Client control (37/41)

Client control