Updated to work with new files without filenames.