Changed to new table-sorting library