some changes from master