Rewrote all sorts with sort descriptors