Updated to support ST3