Same comments that I had on your other PR - this should be passed in as a single file.