some changes to branch 1.1