added remoting
added missing parts