#168 - much simpler api