new File and other changes