move to the new api