update for v0.6