Second round of suggested changes