File changes from the original branch to accept a 2nd input file