change sort set
refactor