slight changes in organization