Darft of sorting (not working)

Change-Id: I5be08a1d334af7fd871680d618637fe71722d0f3