better handling of the weave object when it's ready