- Re-added the sort by number
- Some optimisation of the code