adjust for external API changes