Update to latest rapi