Rework api top simplify it