changes for new interface V2