Adjusting to use new interface.