changes for requestor, remoteId, unsolved linker error