Enhancements to control script.