Copy changes for version 3.0