4_6 solved. Now refactoring is in process. Not finished yet. Build will failed