Updates based on testing with the actual input files...