revise for API changes