Resolving api (2/14)

Resolving api