Proposed updates to fix the outdated parts in the code#1

ydanuiuc wants to merge 3 commits intoTrinkleGroup:masterTrinkleGroup/BaderIntegration:masterfrom

ydanuiuc:masterydanuiuc/BaderIntegration:masterCopy head branch name to clipboard