Remote-self: relocated the code (may now work?)