Fixed lines 9-55