did some suggested changes