near-finished version2