Changed sorting logic base on feedback