more changes for v0.8.0