compelete for v0.8, Reeds branch.