changes to keep up with API changes