Added ability to sort by name