This is the first commit with the segmentation faults