Update to support ST3