#187: Witness-node-rewrite

Change request updated