Client side (16/21)

Client side