working on aapi solution