Kristina's pull request with changed names