undo changes
use simplified controller API