updates to work with API changes