Adding back in Kevin's comments and urls