experimental API changes