Fix order of columns
Add comment
Move to new order.