Changes from using horz & vert to col & row