Added Bart's changes to ParseFile()