reconcile with 4.0 changes