conforming to new core