manually pulled in some changes from another branch