Fixed lines 53 through 99