updates for version 2