Replaced list with table to allow quick sort