update from vigor repo