Start of changes for version 4.0