Updating to use a single figure with multiple spans