Update 970007 wip v2.