Enhance design for 1.2