unnecessary sort function removed
Merge branch 'uidev'