update to latest working copy of 3-wip