Final optimized design for QC devices

Summary
Optimized design for QC devices finalised