changes to implement Requester/Responder (not finished yet)