updated for v2.3.0 changes