Restructurization: step 12