Fixed lines 6 through 24