Update for version 3