some changes to branch 4
some changes to branch 4.1