Updated text, removed cruft, used new sort