Changed reading of files.