update to incorporate API changes