final changes for version 2.0