add requester stuff
Fix merge