Some more performance optimization changes#2

firstuserhere wants to merge 2 commits intodiatkinson:masterdiatkinson/rollout_viz:masterfrom

firstuserhere:masterfirstuserhere/rollout_viz:masterCopy head branch name to clipboard