Fantastic changes that make sorting work