Updated for DC22
Cleanup to match actual submission
Merge branch 'defcon'