Add and edit files to try to resolve segmentation fault