reconcile changes with latest update