Commenting out some lines causing crashes