Change random sort to use Fisher-Yates shuffle