adjust more calls to new interface...