Finished going over Leeat second set of comments