fixing to realign to googles changed API