Back again to mainstream

Only little changes.