Good modification of old version

Branches merging