final changes for version 1