Updated to deal with files with commas in the name