again updates to accommodate for changes in core