Use sorting (24/33)

Use sorting