tweaks to work with proprietary api