Change 'row' to 'column' where appropriate