Fixed lines 7 through 21