updated rpc behavior