Resolving api (4/14)

Resolving api