Rebuild for St2/St3