Update to work with ST3