Fixing new api