update for changes in core