Making some initial structural changes 2