fix this for the new interface