Minor work to leverage scaling