Updated version of both weave/unweave