final changes for version 1.6