Built rows, fixed logic bugz