even less API changes