Final update for version 2