updating code to work w/ Weave master branch