Update to match v.0.2.3