put the columns in standard order and updated doc