Fixed lines 109 through 148