Change API

Btw, now make check pass