Bring wip up to date