Update for version 2