- Full commit of expanded script

- Full commit of expanded script