finish work to v0.5-0.6+