Update #16 to Work with Multiple Files