Update for version 7