Modified infrastructure script