Client based (25/40)

Client based