Added Sorting and junk