Updated with part of new interface.