Code/TH/QQ - update to match SoH