finishing upgraded version of remote-editing