Tweaking API, trying to find a sweet spot