Modification to client_sample and lldpad