final changes for 1.6.0