Added Sorting and issues sorted for deploying