refactor 1
sort more tables