v0.6 final changes