Added ability to sort