namespace and class changed, new comments