Removing blocking from protocol and applying to client