some changes to branch 4.1