restructuring
more restructuring
new script