Fixed lines 6 through 28