accounts for recent changes to core