Revert "version 6"

This reverts commit 35674544a7edbd6b499d373987cbe8d963af9060.
Revert "Revert "version 6""

This reverts commit b3df84e25e40c12565c5979b41eb03b28ee1467d.
version 7