*API, code reorder