Updates after comments from Greg.