switched some of the rapi to new api