Added more names and is sorted
Fixed merge conflict