Starting to fix the row problem