Use sorting (16/33)

Use sorting