Added segmentation faults