TDS now much better after sort and shuffle calls moved