API changes. part 1
API changes. Part 2.