align logic to new so api