Updated to reflect chagnes in Version 2