I replaced the files that were different from Victoria's commit.