new api, fixes