Most work is done. But there is a API change.