improved packaging of results