Complete phase one version