refactoring : iuclass
bugfix : rebase!