add docs + use new API everywhere