Fixed lines 38 through 44