update to match v0.2.x