Done suggested changes