Modify lines 34 to 127