Incorporated suggested changes