updates for v7 upgrade