Upgrade to version 7

orthogonal