Changes to file-reader