Second round of comments also from Matt