some changes for 2.0