upgraded to official API