API changes incorporated