added docco-refactored