updated for new core