update changes for v0.6