merged to new api