Template and control script changes