Remote-self functionality added at another place - time for a separated function. (tbd)