update for version == 2