Mechanix Changes for nested shapes