Fix_lines 33-62