final changes for version 2