rafactoring issues solved ver#2