changes to reflect official API