Restructurization: step 11