updated for API changes
added todo