#312 updating with API changes