Restructurization: step 6