updated for v0.7.1