Changes for file2 from testbranch2