Added comments/links new functionality