Tweaking to fix API