Marco's new version of the files