made changes per harry's comments