Resolving api (3/14)

Resolving api