Update the HStack code for the new CMSUPgrade