incororated API changes