Performance fix#34

jadonyack wants to merge 2 commits intomichiganhackers:mainmichiganhackers/osd-onboarding-v2:mainfrom

jadonyack:mainjadonyack/osd-onboarding-v2:mainCopy head branch name to clipboard