Additional changes to support ST3 and ST2 simultaneously