Sorting and Calculate added