partial changes for version 4.0.0