wip update based on changes in core