Use new refactored version of the weave script
Add refactored weave script and use it