Modified some more files to test multiple parents