Update for version 4.0