Address comments from Tyson