Added ability to sort by date