update to match v2.3.0