made changes from feedback