Modified so that not all columns are put into a single row