updated for v0.3.0