modify for new Core