Updated to include hotfix 7.