Restructurization: step 5