Consolidate with SC files, fix new submission method