finish API changes, make sample apps use them