Changes reflecting core project.