updated for v0.2.4