rpc2 added
minor changes