Use sorting (22/33)

Use sorting