Switch to rapi, change interface