began refactoring QC to handle new format