Resolving api (13/14)

Resolving api