final changes for 2.0 version