Iteration 9 + extra + remodification