structural changes and comments