Updated per team's PR feedback