better resolve and docs