Upgdate to use new interface