Moving more columns into a row
Remove distinct to make run faster