Edit new version 7