unification refactoring part 2
updated column order