updated to new interface