change to conform with new interface