Minor structural changes