Resolving api (6/14)

Resolving api