Resolving api (8/14)

Resolving api