Updating figures to use 2x2 grid of subplots