New design variables (AoA)
Merge fixing