simplified api, updated docs