Design enhancements and interface rework